undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:git/git

Browse Source 
* 'main' of github.com:git/git:
  cmd-list.perl: fix identifying man sections
  pack-bitmap: improve grammar of "xor chain" error message
This commit is contained in:
Jiang Xin 2022-09-24 21:51:06 +08:00
commit 54e1f9f66d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/cmd-list.perl
View File

@ -10,7 +10,7 @@ sub format_one {
$state = 0; $state = 0;
open I, '<', "$name.txt" or die "No such file $name.txt"; open I, '<', "$name.txt" or die "No such file $name.txt";
while (<I>) { while (<I>) {
if (/^(git|scalar)[a-z0-9-]*\(([0-9])\)$/) { if (/^(?:git|scalar)[a-z0-9-]*\(([0-9])\)$/) {
$mansection = $1; $mansection = $1;
next; next;
} }

2
pack-bitmap.c
View File

@ -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); ALLOC_GROW(xor_items, xor_items_nr + 1, xor_items_alloc);
if (xor_items_nr + 1 >= bitmap_git->entry_count) { 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; goto corrupt;
} }