On Thu, Apr 21, 2022 at 09:26:38PM +0800, Teng Long wrote:
> diff --git a/pack-bitmap.c b/pack-bitmap.c
> index f13a6bfe3a..1b268f655e 100644
> --- a/pack-bitmap.c
> +++ b/pack-bitmap.c
> @@ -330,7 +330,8 @@ static int open_midx_bitmap_1(struct bitmap_index *bitmap_git,
> struct strbuf buf = STRBUF_INIT;
> get_midx_filename(&buf, midx->object_dir);
> /* ignore extra bitmap file; we can only handle one */
> - warning("ignoring extra bitmap file: %s", buf.buf);
> + warning(_("a normal or midx bitmap already has been opened"));
> + warning(_("ignoring extra bitmap file: %s"), buf.buf);
I'm glad that the existing warning has been marked for translation.
There's no reason that it couldn't have been before, so I'm glad to see
it added now.
But I'm not sure that the new warning tells the user anything that the
old one didn't. The old warning says "ignoring extra bitmap file: ...",
leading us to believe that another one has already been opened. The new
warning makes the latter part explicit, but I don't think it adds any
new information that wasn't already readily available.
> diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
> index f775fc1ce6..eb63b71852 100755
> --- a/t/t5310-pack-bitmaps.sh
> +++ b/t/t5310-pack-bitmaps.sh
> @@ -421,6 +421,7 @@ test_expect_success 'complains about multiple pack bitmaps' '
> test_line_count = 2 bitmaps &&
>
> git rev-list --use-bitmap-index HEAD 2>err &&
> + grep "a bitmap has been opened" err &&
This is out of sync with the warning you added, causing t5310.74 to
fail.
Thanks,
Taylor
