summaryrefslogtreecommitdiff
path: root/builtin/pack-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-08-26 18:16:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-08-26 18:16:25 (GMT)
commita3d54f9a1fa481727a849b8753fc9d1abafe6583 (patch)
tree0b587d35e77310dd8fdcf6bb8990a525cd189710 /builtin/pack-objects.c
parent212d781c967317a05a704609ddf3ffc8a09f8590 (diff)
parentf7f91086a376ba53f8270ea80b7bbbd8274c3c2d (diff)
downloadgit-a3d54f9a1fa481727a849b8753fc9d1abafe6583.zip
git-a3d54f9a1fa481727a849b8753fc9d1abafe6583.tar.gz
git-a3d54f9a1fa481727a849b8753fc9d1abafe6583.tar.bz2
Merge branch 'jk/pack-shallow-always-without-bitmap'
Reachability bitmaps do not work with shallow operations. Fixes regression in 2.0. * jk/pack-shallow-always-without-bitmap: pack-objects: turn off bitmaps when we see --shallow lines
Diffstat (limited to 'builtin/pack-objects.c')
-rw-r--r--builtin/pack-objects.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 238b502..b59f5d8 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2494,6 +2494,7 @@ static void get_object_list(int ac, const char **av)
if (get_sha1_hex(line + 10, sha1))
die("not an SHA-1 '%s'", line + 10);
register_shallow(sha1);
+ use_bitmap_index = 0;
continue;
}
die("not a rev '%s'", line);