From: Jeff King <peff@peff.net>
To: Brian Gesiak <modocache@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] t3200-branch: test setting branch as own upstream
Date: Fri, 28 Feb 2014 05:59:29 -0500 [thread overview]
Message-ID: <20140228105929.GA18960@sigill.intra.peff.net> (raw)
In-Reply-To: <CAN7MxmUUoz-HGFiTfgpvLpkXhvjBn_dYje7unoHE-Y=k3A0aqg@mail.gmail.com>
On Fri, Feb 28, 2014 at 07:44:10PM +0900, Brian Gesiak wrote:
> > I notice that the warning comes from install_branch_config, which gets
> > used both for "branch -u", but also in the "side effect" case I
> > mentioned above. Is it possible to trigger this as part of such a case?
> > I think maybe "git branch -f --track foo foo" would do it. If so, we
> > should perhaps include a test that it does not break if we upgrade the
> > "-u" case to an error.
>
> Do you mean that install_branch_config should continue to emit a
> warning in the "side effect" case? I'm not sure I agree--how is "git
> branch -f --track foo foo" less erroneous than "git branch -u foo
> refs/heads/foo"? Perhaps I'm missing some insight on how "--track" is
> used.
I'd be more worried about triggering it via the config. E.g.:
git config branch.autosetupmerge always
git branch -f foo foo
Should the second command die? I admit I'm having a hard time coming up
with a feasible reason why anyone would do "branch -f foo foo" in the
first place. I just don't want to regress somebody else's workflow due
to my lack of imagination.
-Peff
next prev parent reply other threads:[~2014-02-28 10:59 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-28 3:04 [PATCH 1/2] t3200-branch: test setting branch as own upstream Brian Gesiak
2014-02-28 3:04 ` [PATCH 2/2] branch: use skip_prefix Brian Gesiak
2014-02-28 5:46 ` Jeff King
2014-03-03 19:54 ` Junio C Hamano
2014-02-28 5:37 ` [PATCH 1/2] t3200-branch: test setting branch as own upstream Jeff King
2014-02-28 6:17 ` Brian Gesiak
2014-02-28 6:27 ` Jeff King
2014-02-28 22:15 ` brian m. carlson
2014-02-28 6:55 ` Johannes Sixt
2014-02-28 7:14 ` Jeff King
2014-02-28 7:26 ` Jeff King
2014-02-28 7:28 ` Brian Gesiak
2014-02-28 8:37 ` Jeff King
2014-02-28 10:44 ` Brian Gesiak
2014-02-28 10:59 ` Jeff King [this message]
2014-02-28 11:16 ` Brian Gesiak
2014-02-28 13:03 ` Jeff King
2014-02-28 14:57 ` Matthieu Moy
2014-03-01 12:19 ` [PATCH v2] branch: die when " Brian Gesiak
2014-03-01 12:23 ` [PATCH 3/3] " Brian Gesiak
2014-03-01 12:26 ` Brian Gesiak
2014-02-28 7:40 ` [PATCH 1/2] t3200-branch: test " Johannes Sixt
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=20140228105929.GA18960@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=modocache@gmail.com \
/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).