git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Carlos Martín Nieto" <cmn@elego.de>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>,
	mathstuf@gmail.com
Subject: [PATCH 3/3] fetch: treat --tags like refs/tags/*:refs/tags/* when pruning
Date: Thu,  6 Oct 2011 23:21:47 +0200	[thread overview]
Message-ID: <1317936107-1230-4-git-send-email-cmn@elego.de> (raw)
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

  parent reply	other threads:[~2011-10-06 21:21 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-06 20:19 [PATCH 0/3] Be more careful when prunning Carlos Martín Nieto
2011-10-06 20:19 ` [PATCH 1/3] fetch: free all the additional refspecs Carlos Martín Nieto
2011-10-06 20:19 ` [PATCH 2/3] fetch: honor the user-provided refspecs when pruning refs Carlos Martín Nieto
2011-10-06 20:19 ` [PATCH 3/3] fetch: treat --tags like refs/tags/*:refs/tags/* when pruning Carlos Martín Nieto
2011-10-06 20:51 ` [PATCH 0/3] Be more careful when prunning Ben Boeckel
2011-10-06 20:58   ` Carlos Martín Nieto
2011-10-06 21:21   ` [PATCHv2 " Carlos Martín Nieto
2011-10-06 21:21     ` [PATCH 1/3] fetch: free all the additional refspecs Carlos Martín Nieto
2011-10-06 21:21     ` [PATCH 2/3] fetch: honor the user-provided refspecs when pruning refs Carlos Martín Nieto
2011-10-07 16:26       ` Jeff King
2011-10-07 16:37         ` Carlos Martín Nieto
2011-10-07 16:39           ` Jeff King
2011-10-06 21:21     ` Carlos Martín Nieto [this message]
2011-10-07 16:33       ` [PATCH 3/3] fetch: treat --tags like refs/tags/*:refs/tags/* when pruning Jeff King
2011-10-07 16:40         ` Carlos Martín Nieto

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1317936107-1230-4-git-send-email-cmn@elego.de \
    --to=cmn@elego.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mathstuf@gmail.com \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).