From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 0/6] Reroll of rr/triangular-push-fix
Date: Mon, 24 Jun 2013 19:21:05 +0530 [thread overview]
Message-ID: <CALkWK0=L4X=5UrCPygoUeLo9byvRKh4bez0DVB5iqatLvdEEfA@mail.gmail.com> (raw)
In-Reply-To: <7vli60c4gu.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> 'simple' is supposed to be an easy and safe default to help new
> people. Your original patch to change its semantics for the central
> workflow from the current 'make sure upstream is set and set to the
> same name' to 'anything goes' is making the mode more dangerous than
> the corresponding 'upstream'. Such a mode may have its place, but
> labelling such a mode with rough edges as 'simple' and forcing it on
> new people _is_ stupid, IMHO.
Oh, I agree that "anything goes" was the wrong approach. However, I
think a sane default for branch.$branch.merge is a good way forward.
> In any case, the good news is, if you start strict, and if it turns
> out to be stricter than necessary, it is easier to loosen it later,
> because nobody would be relying on an operation to _fail_.
Okay, I will quote you if you raise issues about "preserving how it
has historically been functioning" when I complete the upstream-fix
topic.
There's no need to stall this series then: [1/6] to [5/6] largely look
good-to-merge; drop [6/6], as it needs more thought.
prev parent reply other threads:[~2013-06-24 13:51 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-24 4:33 [PATCH 0/6] Reroll of rr/triangular-push-fix Junio C Hamano
2013-06-24 4:33 ` [PATCH 1/6] t/t5528-push-default: remove redundant test_config lines Junio C Hamano
2013-06-24 4:33 ` [PATCH 2/6] config doc: rewrite push.default section Junio C Hamano
2013-06-24 4:33 ` [PATCH 3/6] push: change `simple` to accommodate triangular workflows Junio C Hamano
2013-06-24 6:58 ` Johan Herland
2013-06-24 7:43 ` Junio C Hamano
2013-06-24 7:46 ` Ramkumar Ramachandra
2013-06-24 8:48 ` Johan Herland
2013-06-24 14:13 ` Ramkumar Ramachandra
2013-06-24 7:59 ` Junio C Hamano
2013-06-24 8:48 ` Johan Herland
2013-06-24 4:33 ` [PATCH 4/6] t/t5528-push-default: generalize test_push_* Junio C Hamano
2013-06-24 6:58 ` Johan Herland
2013-06-24 7:28 ` Junio C Hamano
2013-06-24 8:33 ` Johan Herland
2013-06-24 8:44 ` Eric Sunshine
2013-06-24 9:45 ` Johan Herland
2013-06-24 17:21 ` Junio C Hamano
2013-06-24 4:33 ` [PATCH 5/6] t/t5528-push-default: test pushdefault workflows Junio C Hamano
2013-06-24 4:33 ` [PATCH 6/6] push: honor branch.*.push Junio C Hamano
2013-06-24 6:58 ` Johan Herland
2013-06-24 7:47 ` Junio C Hamano
2013-06-24 7:58 ` Ramkumar Ramachandra
2013-06-24 8:17 ` Junio C Hamano
2013-06-24 14:19 ` Ramkumar Ramachandra
2013-06-24 15:23 ` Johan Herland
2013-06-24 16:08 ` Junio C Hamano
2013-06-24 15:41 ` Junio C Hamano
2013-06-24 16:09 ` Ramkumar Ramachandra
2013-06-24 16:53 ` Junio C Hamano
2013-06-24 17:13 ` Ramkumar Ramachandra
2013-06-24 18:19 ` Junio C Hamano
2013-06-24 18:23 ` Ramkumar Ramachandra
2013-06-24 7:21 ` [PATCH 0/6] Reroll of rr/triangular-push-fix Ramkumar Ramachandra
2013-06-24 8:12 ` Junio C Hamano
2013-06-24 13:51 ` Ramkumar Ramachandra [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CALkWK0=L4X=5UrCPygoUeLo9byvRKh4bez0DVB5iqatLvdEEfA@mail.gmail.com' \
--to=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).