diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2022-09-24 21:51:06 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2022-09-24 21:51:06 +0800 |
| commit | 54e1f9f66deb1c706f90696f4fbe1194f8069212 (patch) | |
| tree | 61fd83f3bde9ac78d92018ffe8d94f874616fd97 | |
| parent | 456a75f81445b84258ce5a6df13e4d0572a0c892 (diff) | |
| parent | 4fd6c5e44459e6444c2cd93383660134c95aabd1 (diff) | |
| download | git-54e1f9f66deb1c706f90696f4fbe1194f8069212.tar.xz | |
Merge branch 'main' of github.com:git/git
* 'main' of github.com:git/git:
cmd-list.perl: fix identifying man sections
pack-bitmap: improve grammar of "xor chain" error message
| -rwxr-xr-x | Documentation/cmd-list.perl | 2 | ||||
| -rw-r--r-- | pack-bitmap.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 (<I>) { - if (/^(git|scalar)[a-z0-9-]*\(([0-9])\)$/) { + if (/^(?:git|scalar)[a-z0-9-]*\(([0-9])\)$/) { $mansection = $1; next; } 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; } |