@@ -331,8 +331,8 @@ static int open_midx_bitmap_1(struct bitmap_index *bitmap_git,
if (bitmap_git->pack || bitmap_git->midx) {
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);
+ /* ignore extra midx bitmap files; we can only handle one */
+ warning("ignoring extra midx bitmap files");
close(fd);
strbuf_release(&buf);
return -1;
@@ -402,8 +402,8 @@ static int open_pack_bitmap_1(struct bitmap_index *bitmap_git, struct packed_git
}
if (bitmap_git->pack || bitmap_git->midx) {
- /* ignore extra bitmap file; we can only handle one */
- warning("ignoring extra bitmap file: %s", packfile->pack_name);
+ /* ignore extra bitmap files; we can only handle one */
+ warning("ignoring extra bitmap files");
close(fd);
return -1;
}
@@ -421,7 +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 "ignoring extra bitmap file" err
+ grep "ignoring extra bitmap files" err
)
'
@@ -303,7 +303,7 @@ test_expect_success 'graceful fallback when missing reverse index' '
GIT_TEST_MIDX_READ_RIDX=0 \
git rev-list --use-bitmap-index HEAD 2>err &&
- ! grep "ignoring extra bitmap file" err
+ grep "multi-pack bitmap is missing required reverse index" err
)
'
In "open_midx_bitmap_1()" and "open_pack_bitmap_1()", when we find that there are multiple bitmaps, we will only open the first one and then leave warnings about the remaining pack information, the information will contain the absolute path of the repository, for example in a alternates usage scenario. So let's hide this kind of potentially sensitive information in this commit. Found-by: XingXin <moweng.xx@antgroup.com> Signed-off-by: Teng Long <dyroneteng@gmail.com> --- pack-bitmap.c | 8 ++++---- t/t5310-pack-bitmaps.sh | 2 +- t/t5326-multi-pack-bitmaps.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)