From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [RFH] hackday and GSoC topic suggestions
Date: Tue, 11 Feb 2014 11:38:09 -0800 [thread overview]
Message-ID: <xmqqeh39phi6.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqq1tz9qxyl.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Tue, 11 Feb 2014 10:57:22 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> Jeff King <peff@peff.net> writes:
>
>> - Branch rename breaks local downstream branches
>> http://article.gmane.org/gmane.comp.version-control.git/241228
>
> If you have a branch B that builds on A, if you are renaming A to C,
> you may want B to automatically set to build on C in some cases, and
> in other cases your renaming A is done explicitly in order to severe
> the tie between A and B and setting the latter to build on C can be
> a bad thing---after all, the user's intention may be to create a
> branch A starting at some commit immediately after this rename so
> that B will keep building on that updated A.
>
> So I am not sure if this is a bug.
Having said that, the current behaviour of leaving B half-configured
to build on a missing branch is undesirable. If we were to change
this so that any branch B that used to build on branch A being
renamed to build on the branch under the new name C, the user may
have to do an extra "--set-upstream-to A" on B after recreating A if
this was done to save away the current state of A to C and then keep
building B on an updated A, so we may have to give _some_ clue what
we are doing behind their back when we rename, e.g.
$ git branch -m A C
warning: branch B is set to build on C now.
or something.
next prev parent reply other threads:[~2014-02-11 19:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-05 22:57 [RFH] hackday and GSoC topic suggestions Jeff King
2014-02-06 9:10 ` Christian Couder
2014-02-06 9:51 ` Matthieu Moy
2014-02-13 8:50 ` Jeff King
2014-02-13 9:28 ` Christian Couder
2014-02-13 9:55 ` David Kastrup
2014-02-08 18:43 ` Thomas Rast
2014-02-08 18:55 ` Jeff King
2014-02-08 19:03 ` Thomas Rast
2014-02-16 14:42 ` Duy Nguyen
2014-02-16 15:29 ` Thomas Rast
2014-02-11 18:57 ` Junio C Hamano
2014-02-11 19:38 ` Junio C Hamano [this message]
2014-02-13 8:37 ` Jeff King
2014-02-13 8:41 ` Jeff King
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=xmqqeh39phi6.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.