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: [PATCHv2 0/3] Be more careful when prunning
Date: Thu,  6 Oct 2011 23:21:44 +0200	[thread overview]
Message-ID: <1317936107-1230-1-git-send-email-cmn@elego.de> (raw)
In-Reply-To: <20111006205103.GA1271@erythro.kitwarein.com>

Hello,

The first patch is not that big a deal, but it's better if we're
freeing the refspecs, we might as well free all of them.

The second patch teaches get_stale_heads to use the user-provided
refspecs instead of the ones in the config. For example, running

    git fetch --prune origin refs/heads/master:refs/heads/master

doesn't remove the other branches anymore. For a more interesting (and
believable) example, let's take

    git fetch --prune origin refs/heads/b/*:refs/heads/b/*

because you want to prune the refs inside the b/ namespace
only. Currently git will delete all the refs that aren't under that
namespace. With the second patch applied, git won't remove any refs
outside the b/ namespace.

What is probably the most usual case is covered by the third patch,
which pretends that a "refs/tags/*:refs/tags/*" refspec was given on
the command-line.

Version 1 assumed that a refspec would have its dst filled
automatically. This is not the case and was fixed in the second patch.

Cheers,
   cmn

Carlos Martín Nieto (3):
      fetch: free all the additional refspecs
      fetch: honor the user-provided refspecs when pruning refs
      fetch: treat --tags like refs/tags/*:refs/tags/* when pruning

 builtin/fetch.c  |   19 ++++++++++---
 builtin/remote.c |    2 +-
 remote.c         |   74 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 remote.h         |    3 +-
 4 files changed, 84 insertions(+), 14 deletions(-)

-- 
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   ` Carlos Martín Nieto [this message]
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     ` [PATCH 3/3] fetch: treat --tags like refs/tags/*:refs/tags/* when pruning Carlos Martín Nieto
2011-10-07 16:33       ` 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-1-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).