Merge branch 'ac/bitmap-lookup-table'

gitster · gitster · commit 4fd6c5e44459 · 2022-09-23T11:07:49.000-07:00
Grammofix.

* ac/bitmap-lookup-table:
  pack-bitmap: improve grammar of "xor chain" error message
diff --git 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;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -723,7 +723,7 @@ static struct stored_bitmap lazy_bitmap_for_commit(struct bitmap_index bitmap_`
`723`	`723`	`ALLOC_GROW(xor_items, xor_items_nr + 1, xor_items_alloc);`
`724`	`724`
`725`	`725`	`if (xor_items_nr + 1 >= bitmap_git->entry_count) {`
`726`		`- error(_("corrupt bitmap lookup table: xor chain exceed entry count"));`
	`726`	`+ error(_("corrupt bitmap lookup table: xor chain exceeds entry count"));`
`727`	`727`	`goto corrupt;`
`728`	`728`	`}`
`729`	`729`