diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-28 19:53:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-28 19:53:32 (GMT) |
| commit | 0079732e960dc20ab2a68043d5593de358f1377f (patch) | |
| tree | d84fbe6b6f5a8126fe6b5c7fd868ff243fa8d14b /fetch-pack.c | |
| parent | 8d3661d5b1c7ca698a863625a05888c66004d3c1 (diff) | |
| parent | c12c9df5275add49b7b47cad82879a84c6bea469 (diff) | |
| download | git-0079732e960dc20ab2a68043d5593de358f1377f.zip git-0079732e960dc20ab2a68043d5593de358f1377f.tar.gz git-0079732e960dc20ab2a68043d5593de358f1377f.tar.bz2 | |
Merge branch 'jk/fetch-all-peeled-fix'
"git fetch-pack --all" used to unnecessarily fail upon seeing an
annotated tag that points at an object other than a commit.
* jk/fetch-all-peeled-fix:
fetch-pack: test explicitly that --all can fetch tag references pointing to non-commits
fetch-pack: don't try to fetch peel values with --all
Diffstat (limited to 'fetch-pack.c')
| -rw-r--r-- | fetch-pack.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index a320ce9..cc7a42f 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -657,11 +657,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; |