diff options
| author | Nelson Elhage <nelhage@ksplice.com> | 2010-08-12 14:18:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-12 20:26:05 (GMT) |
| commit | 6e2a09d24b2634cdfec3395122cd4a07eb517b0d (patch) | |
| tree | ae449e38f0318eda974a772a283f468203e726a0 | |
| parent | b5e233ecc411c8685463333d180a135c6866c50e (diff) | |
| download | git-6e2a09d24b2634cdfec3395122cd4a07eb517b0d.zip git-6e2a09d24b2634cdfec3395122cd4a07eb517b0d.tar.gz git-6e2a09d24b2634cdfec3395122cd4a07eb517b0d.tar.bz2 | |
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 <replaced-object> !
Signed-off-by: Nelson Elhage <nelhage@ksplice.com>
Acked-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/index-pack.c | 2 | ||||
| -rwxr-xr-x | t/t6050-replace.sh | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index a89ae83..fad76bf 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 203ffdb..4185b7c 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 |