From: Nelson Elhage Date: Thu, 12 Aug 2010 14:18:12 +0000 (-0400) Subject: index-pack: Don't follow replace refs. X-Git-Tag: v1.7.2.2~7 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6e2a09d24b2634cdfec3395122cd4a07eb517b0d;p=git.git index-pack: Don't follow replace refs. Without this, attempting to index a pack containing objects that have been replaced results in a fatal error that looks like: fatal: SHA1 COLLISION FOUND WITH ! Signed-off-by: Nelson Elhage Acked-by: Christian Couder Signed-off-by: Junio C Hamano --- diff --git a/builtin/index-pack.c b/builtin/index-pack.c index a89ae831d..fad76bf7a 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -884,6 +884,8 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix) if (argc == 2 && !strcmp(argv[1], "-h")) usage(index_pack_usage); + read_replace_refs = 0; + /* * We wish to read the repository's config file if any, and * for that it is necessary to call setup_git_directory_gently(). diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index 203ffdb17..4185b7ca1 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -219,6 +219,12 @@ test_expect_success 'bisect and replacements' ' git bisect reset ' +test_expect_success 'index-pack and replacements' ' + git --no-replace-objects rev-list --objects HEAD | + git --no-replace-objects pack-objects test- && + git index-pack test-*.pack +' + # # test_done