From 711340c797ce501c732eb2b6accee0608c62d4e9 Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Wed, 21 Sep 2022 20:51:58 -0600 Subject: [PATCH 1/2] pack-bitmap: improve grammar of "xor chain" error message Signed-off-by: Alex Henrie Signed-off-by: Junio C Hamano --- pack-bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack-bitmap.c b/pack-bitmap.c index 9a208abc1f..9d5205055a 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -723,7 +723,7 @@ static struct stored_bitmap *lazy_bitmap_for_commit(struct bitmap_index *bitmap_ ALLOC_GROW(xor_items, xor_items_nr + 1, xor_items_alloc); if (xor_items_nr + 1 >= bitmap_git->entry_count) { - error(_("corrupt bitmap lookup table: xor chain exceed entry count")); + error(_("corrupt bitmap lookup table: xor chain exceeds entry count")); goto corrupt; } From 32c6fff4b871e510b7d782a4f888609da0089c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20=C3=85gren?= Date: Fri, 23 Sep 2022 10:07:33 +0200 Subject: [PATCH 2/2] cmd-list.perl: fix identifying man sections MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We attribute each documentation text file to a man section by finding a line in the file that looks like "gitfoo()". Commit cc75e556a9 ("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 cc75e556a9. [1] https://lore.kernel.org/git/220923.86wn9u4joo.gmgdl@evledraar.gmail.com/#t Helped-by: Ævar Arnfjörð Bjarmason Signed-off-by: Martin Ågren Signed-off-by: Junio C Hamano --- Documentation/cmd-list.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/cmd-list.perl b/Documentation/cmd-list.perl index 9515a499a3..755a110bc4 100755 --- a/Documentation/cmd-list.perl +++ b/Documentation/cmd-list.perl @@ -10,7 +10,7 @@ sub format_one { $state = 0; open I, '<', "$name.txt" or die "No such file $name.txt"; while () { - if (/^(git|scalar)[a-z0-9-]*\(([0-9])\)$/) { + if (/^(?:git|scalar)[a-z0-9-]*\(([0-9])\)$/) { $mansection = $1; next; }