From e8c1e6c796c1b96b6b208bbd4bc8cfd9acb481b5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Sat, 15 Oct 2011 07:04:26 +0200 Subject: [PATCH] fetch: treat --tags like refs/tags/*:refs/tags/* when pruning MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit If --tags is specified, add that refspec to the list given to prune_refs so it knows to treat it as a filter on what refs to should consider for prunning. This way git fetch --prune --tags origin only prunes tags and doesn't delete the branch refs. Signed-off-by: Carlos Martín Nieto Signed-off-by: Junio C Hamano --- builtin/fetch.c | 23 +++++++++++++++++++++-- t/t5510-fetch.sh | 4 ++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index e295d97fdb..9d481f8ca9 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -735,10 +735,29 @@ static int do_fetch(struct transport *transport, return 1; } if (prune) { - if (ref_count) + /* If --tags was specified, pretend the user gave us the canonical tags refspec */ + if (tags == TAGS_SET) { + const char *tags_str = "refs/tags/*:refs/tags/*"; + struct refspec *tags_refspec, *refspec; + + /* Copy the refspec and add the tags to it */ + refspec = xcalloc(ref_count + 1, sizeof(struct refspec)); + tags_refspec = parse_fetch_refspec(1, &tags_str); + memcpy(refspec, refs, ref_count * sizeof(struct refspec)); + memcpy(&refspec[ref_count], tags_refspec, sizeof(struct refspec)); + ref_count++; + + prune_refs(refspec, ref_count, ref_map); + + ref_count--; + /* The rest of the strings belong to fetch_one */ + free_refspec(1, tags_refspec); + free(refspec); + } else if (ref_count) { prune_refs(refs, ref_count, ref_map); - else + } else { prune_refs(transport->remote->fetch, transport->remote->fetch_refspec_nr, ref_map); + } } free_refs(ref_map); diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 581049bf94..e0af4c4e62 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -105,7 +105,7 @@ test_expect_success 'fetch --prune with a namespace keeps other namespaces' ' git rev-parse origin/master ' -test_expect_failure 'fetch --prune --tags does not delete the remote-tracking branches' ' +test_expect_success 'fetch --prune --tags does not delete the remote-tracking branches' ' cd "$D" && git clone . prune-tags && cd prune-tags && @@ -116,7 +116,7 @@ test_expect_failure 'fetch --prune --tags does not delete the remote-tracking br test_must_fail git rev-parse somebranch ' -test_expect_failure 'fetch --prune --tags with branch does not delete other remote-tracking branches' ' +test_expect_success 'fetch --prune --tags with branch does not delete other remote-tracking branches' ' cd "$D" && git clone . prune-tags-branch && cd prune-tags-branch && -- 2.11.4.GIT