From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jared Hance <jaredhance@gmail.com>,
git@vger.kernel.org,
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>,
Andreas Schwab <schwab@linux-m68k.org>,
Bert Wesarg <bert.wesarg@gmail.com>, Jeff King <peff@peff.net>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: Re: [PATCH v2] Add support for merging from upstream by default.
Date: Tue, 8 Feb 2011 19:48:46 -0600 [thread overview]
Message-ID: <20110209014846.GC24346@elie> (raw)
In-Reply-To: <7vpqr2oyy3.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> Jonathan Nieder <jrnieder@gmail.com> writes:
>> Could you give an example of breakage this configurability is designed
>> to prevent?
>
> I think there is no "prevent" or "breakage"; the patch is to give people a
> way to turn the feature on; without the configuration, "git merge" will
> keep the traditional behaviour, no?
Yes. One answer to my question is that a person might try
git fetch git://some/random/repository branch
git merge
and at least for now it seems sensible to make that error out by
default rather than doing something unexpected.
In other words, another possible rule is "default to the last fetched
branch" (FETCH_HEAD), so the intent behind running "git merge" without
a branchname for the first time is not as obvious as I would hope.
next prev parent reply other threads:[~2011-02-09 1:48 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-08 20:48 [PATCH v2] Add support for merging from upstream by default Jared Hance
2011-02-08 21:38 ` Jay Soffian
2011-02-08 22:33 ` Jonathan Nieder
2011-02-09 0:04 ` Junio C Hamano
2011-02-09 1:48 ` Jonathan Nieder [this message]
2011-02-09 0:23 ` [PATCH v3 0/3] Updated patch series for default upstream merge Jared Hance
2011-02-09 0:23 ` [PATCH v3 1/3] Add setup_merge_commit function to merge/builtin.c Jared Hance
2011-02-09 23:24 ` Junio C Hamano
2011-02-09 0:23 ` [PATCH v3 2/3] Add function per_branch_config Jared Hance
2011-02-09 1:14 ` Jonathan Nieder
2011-02-09 23:27 ` Junio C Hamano
2011-02-09 0:23 ` [PATCH v3 3/3] Add support for merging from upstream by default Jared Hance
2011-02-09 1:41 ` Jonathan Nieder
2011-02-09 0:34 ` [PATCH v3 0/3] Updated patch series for default upstream merge Junio C Hamano
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=20110209014846.GC24346@elie \
--to=jrnieder@gmail.com \
--cc=bert.wesarg@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jaredhance@gmail.com \
--cc=martin.von.zweigbergk@gmail.com \
--cc=peff@peff.net \
--cc=schwab@linux-m68k.org \
/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).