[PATCH 3/3] fetch: treat --tags like refs/tags/*:refs/tags/* when pruning
- From
Carlos Martín Nieto <cmn@elego.de>
- Date
- Oct 6, 2011, 21:21 UTC
- Message-ID
- <1317936107-1230-4-git-send-email-cmn@elego.de>
- In-Reply-To
- <1317936107-1230-1-git-send-email-cmn@elego.de>
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 <cmn@elego.de> --- builtin/fetch.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c index b937d71..94b2bd3 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -699,8 +699,17 @@ static int do_fetch(struct transport *transport, free_refs(ref_map); return 1; } - if (prune) + if (prune) { + /* If --tags was specified, we need to tell prune_refs + * that we're filtering the refs from the remote */ + if (tags == TAGS_SET) { + const char * tags_refspec = "refs/tags/*:refs/tags/*"; + refs = xrealloc(refs, (ref_count + 1) * sizeof(struct refspec)); + refs[ref_count] = *parse_fetch_refspec(1, &tags_refspec); + ref_count++; + } prune_refs(transport, refs, ref_count, ref_map); + } free_refs(ref_map); /* if neither --no-tags nor --tags was specified, do automated tag
-- 1.7.5.2.354.g349bf