Skip to content

Commit 32c6fff

Browse files
Martin Ågrengitster
authored andcommitted
cmd-list.perl: fix identifying man sections
We attribute each documentation text file to a man section by finding a line in the file that looks like "gitfoo(<digit>)". Commit cc75e55 ("scalar: add to 'git help -a' command list", 2022-09-02) updated this logic to look not only for "gitfoo" but also "scalarfoo". In doing so, it forgot to account for the fact that after the updated regex has found a match, the man section is no longer to be found in `$1` but now lives in `$2`. This makes our git(1) manpage look as follows: Main porcelain commands git-add(git) Add file contents to the index. [...] gitk(git) The Git repository browser. scalar(scalar) A tool for managing large Git repositories. Restore the man sections by not capturing the (git|scalar) part of the match into `$1`. As noted by Ævar [1], we could even match any "foo" rather than just "gitfoo" and "scalarfoo", but that's a larger change. For now, just fix the regression in cc75e55. [1] https://lore.kernel.org/git/[email protected]/#t Helped-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Martin Ågren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4b79ee4 commit 32c6fff

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/cmd-list.perl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ sub format_one {
1010
$state = 0;
1111
open I, '<', "$name.txt" or die "No such file $name.txt";
1212
while (<I>) {
13-
if (/^(git|scalar)[a-z0-9-]*\(([0-9])\)$/) {
13+
if (/^(?:git|scalar)[a-z0-9-]*\(([0-9])\)$/) {
1414
$mansection = $1;
1515
next;
1616
}

0 commit comments

Comments
 (0)