summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-05 21:40:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-05 21:40:58 (GMT)
commit2ea3df68e881405940596b8c299921f681f8c22c (patch)
tree55a5973fe24539164e49fde425af6590822e5e6b
parentbda790474690a5e5e9963221dc0d5b66fbf01875 (diff)
parent6da8bdcbbfd5ac9c4a92de79d7b4343d5d6bd4c5 (diff)
downloadgit-2ea3df68e881405940596b8c299921f681f8c22c.zip
git-2ea3df68e881405940596b8c299921f681f8c22c.tar.gz
git-2ea3df68e881405940596b8c299921f681f8c22c.tar.bz2
Merge branch 'nd/fetch-pack-shallow-fix' into maint
The recent "short-cut clone connectivity check" topic broke a shallow repository when a fetch operation tries to auto-follow tags. * nd/fetch-pack-shallow-fix: fetch-pack: do not remove .git/shallow file when --depth is not specified
-rw-r--r--fetch-pack.c4
-rwxr-xr-xt/t5500-fetch-pack.sh16
2 files changed, 19 insertions, 1 deletions
diff --git a/fetch-pack.c b/fetch-pack.c
index 6684348..f5d99c1 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -897,6 +897,8 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
packet_flush(fd[1]);
if (args->depth > 0)
setup_alternate_shallow();
+ else
+ alternate_shallow_file = NULL;
if (get_pack(args, fd, pack_lockfile))
die("git fetch-pack: fetch failed.");
@@ -987,7 +989,7 @@ struct ref *fetch_pack(struct fetch_pack_args *args,
}
ref_cpy = do_fetch_pack(args, fd, ref, sought, nr_sought, pack_lockfile);
- if (alternate_shallow_file) {
+ if (args->depth > 0 && alternate_shallow_file) {
if (*alternate_shallow_file == '\0') { /* --unshallow */
unlink_or_warn(git_path("shallow"));
rollback_lock_file(&shallow_lock);
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index fd2598e..a80584e 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -505,4 +505,20 @@ test_expect_success 'test --all, --depth, and explicit tag' '
) >out-adt 2>error-adt
'
+test_expect_success 'shallow fetch with tags does not break the repository' '
+ mkdir repo1 &&
+ (
+ cd repo1 &&
+ git init &&
+ test_commit 1 &&
+ test_commit 2 &&
+ test_commit 3 &&
+ mkdir repo2 &&
+ cd repo2 &&
+ git init &&
+ git fetch --depth=2 ../.git master:branch &&
+ git fsck
+ )
+'
+
test_done