diff options
| -rw-r--r-- | fetch-pack.c | 8 | ||||
| -rwxr-xr-x | t/t5500-fetch-pack.sh | 10 |
2 files changed, 14 insertions, 4 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index 601f0779a1..c85fc6aeed 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -582,11 +582,11 @@ static void filter_refs(struct fetch_pack_args *args, } i++; } - } - if (!keep && args->fetch_all && - (!args->deepen || !starts_with(ref->name, "refs/tags/"))) - keep = 1; + if (!keep && args->fetch_all && + (!args->deepen || !starts_with(ref->name, "refs/tags/"))) + keep = 1; + } if (keep) { *newtail = ref; diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh index 505e1b4a7f..f20bb59d22 100755 --- a/t/t5500-fetch-pack.sh +++ b/t/t5500-fetch-pack.sh @@ -518,6 +518,16 @@ test_expect_success 'test --all, --depth, and explicit tag' ' ) >out-adt 2>error-adt ' +test_expect_success 'test --all with tag to non-tip' ' + git commit --allow-empty -m non-tip && + git commit --allow-empty -m tip && + git tag -m "annotated" non-tip HEAD^ && + ( + cd client && + git fetch-pack --all .. + ) +' + test_expect_success 'shallow fetch with tags does not break the repository' ' mkdir repo1 && ( |