Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: "Simon Holm Thøgersen" <odie@cs.aau.dk>,
	git@vger.kernel.org, "Ingo Molnar" <mingo@elte.hu>
Subject: Re: bug related to branches using / in name
Date: Fri, 27 Jun 2008 16:31:30 -0700	[thread overview]
Message-ID: <7vtzfemp4d.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080627035747.GC7144@sigill.intra.peff.net> (Jeff King's message of "Thu, 26 Jun 2008 23:57:47 -0400")

Jeff King <peff@peff.net> writes:

> On Thu, Jun 26, 2008 at 11:02:46PM -0400, Jeff King wrote:
>
>> It might be nicer if this were handled automatically, but it would
>> violate git-fetch's rule about never deleting branches.

Hmm.  Is there actually such a rule?

I was wondering if it might make more sense to do the equivalent of what
checkout_entry() does (i.e. remove_subtree()) when there is such a
conflict.  After all, tracking branches are meant to accept rewinds and
anything that happens on the remote end, and having to run "git remote
prune" is not a feature but is a lack of feature in the "git fetch", which
may make it look like deletion is somewhat special.

  parent reply	other threads:[~2008-06-27 23:32 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-26 19:42 bug related to branches using / in name Simon Holm Thøgersen
2008-06-27  3:02 ` Jeff King
2008-06-27  3:04   ` Jeff King
2008-06-27  8:32     ` Simon Holm Thøgersen
2008-06-27  3:57   ` Jeff King
2008-06-27  3:59     ` [PATCH] fetch: report local storage errors in status table Jeff King
2008-06-27 23:37       ` Junio C Hamano
2008-06-28  4:21         ` Jeff King
2008-06-27  4:01     ` [PATCH 2/2] fetch: give a hint to the user when local refs fail to update Jeff King
2008-06-27 23:31     ` Junio C Hamano [this message]
2008-06-28  4:18       ` bug related to branches using / in name Jeff King
2008-06-28  4:57         ` Junio C Hamano
2008-06-28 11:42         ` Jakub Narebski

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=7vtzfemp4d.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=odie@cs.aau.dk \
    --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