summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2013-12-21 09:00:34 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-12-30 12:19:23 -0800
commitd3d3e4c490c83daeba61ac1f2be5da2396f7411c (patch)
tree8c6bd0e30887ec4ca99124fdc34d32bad36a62ff
parentrepack: consider bitmaps when performing repacks (diff)
downloadtgif-d3d3e4c490c83daeba61ac1f2be5da2396f7411c.tar.xz
count-objects: recognize .bitmap in garbage-checking
Count-objects will report any "garbage" files in the packs directory, including files whose extensions it does not know (case 1), and files whose matching ".pack" file is missing (case 2). Without having learned about ".bitmap" files, the current code reports all such files as garbage (case 1), even if their pack exists. Instead, they should be treated as case 2. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--sha1_file.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 4714bd8671..129496250c 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1194,6 +1194,7 @@ static void prepare_packed_git_one(char *objdir, int local)
if (has_extension(de->d_name, ".idx") ||
has_extension(de->d_name, ".pack") ||
+ has_extension(de->d_name, ".bitmap") ||
has_extension(de->d_name, ".keep"))
string_list_append(&garbage, path);
else