From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
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: Sat, 28 Jun 2008 00:18:41 -0400 [thread overview]
Message-ID: <20080628041841.GA9451@sigill.intra.peff.net> (raw)
In-Reply-To: <7vtzfemp4d.fsf@gitster.siamese.dyndns.org>
On Fri, Jun 27, 2008 at 04:31:30PM -0700, Junio C Hamano 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 thought so, though I don't necessarily agree with it. But I seem to
recall this being touted as a feature in the past; a remote deleting
some work will not cause it to be deleted locally.
> 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
As as long your "equivalent of" means "branch -d"; we need to kill off
both the ref and its reflogs. And therefore...
> 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.
The one key difference between rewinds and branch deletion is that the
latter will kill off the reflog, making the history inaccessible. You
can always still access rewound or rebased work via the reflog.
If we don't care about this "safety feature", then I definitely agree
that we should fix the problem rather than hint to the user.
-Peff
next prev parent reply other threads:[~2008-06-28 4:19 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 ` bug related to branches using / in name Junio C Hamano
2008-06-28 4:18 ` Jeff King [this message]
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=20080628041841.GA9451@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mingo@elte.hu \
--cc=odie@cs.aau.dk \
/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