From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Marc Branchaud <marcnarc@xiplink.com>
Cc: "Michael Haggerty" <mhagger@alum.mit.edu>,
"Carlos Martín Nieto" <cmn@elego.de>,
git@vger.kernel.org, gitster@pobox.com
Subject: Re: [RFC PATCH] push: start warning upcoming default change for push.default
Date: Mon, 12 Mar 2012 17:37:32 +0100 [thread overview]
Message-ID: <vpqzkblixmb.fsf@bauges.imag.fr> (raw)
In-Reply-To: <4F5E12A5.6030701@xiplink.com> (Marc Branchaud's message of "Mon, 12 Mar 2012 11:13:41 -0400")
Marc Branchaud <marcnarc@xiplink.com> writes:
> On 12-03-10 01:16 AM, Michael Haggerty wrote:
>>
>> I propose that the default should be even stricter: like "current", it
>> would push to an branch with the same name as the current local branch,
>> *but only if that branch already exists on the remote*. It would only
>> be possible to create a new branch on the remote by calling "git push"
>> with an explicit branch argument. I believe that such a policy would do
>> the right thing in the cases where the "right thing" is pretty
>> unambiguous, and would require a user decision in other cases.
>
> I haven't thought it through very deeply, but at first glance this seems like
> reasonable default behaviour to me.
I do find it reasonable, but I think 'upstream' has several advantages
over it.
* 'upstream' makes "git push" and "git pull" symmetrical. While there
are workflows where it is usefull to have "push" and "pull" point to
different branches, I think it is far more intuitive to have this
symmetry by default.
* For newbies, the sequence "create an empty repository, clone it,
commit and push" works like a charm with either 'upstream' or
'current'. Today, the first push to an empty repository requires
either saying "git push origin master" or "git push --all", both of
which sound like black magic to the poor user who did not yet learn
what 'origin' is and what a branch is.
* 'upstream' makes it easy to create a local topic branch, and let
'push' send it to the master branch (i.e. have local 'topic-branch'
pull and push to 'origin/master'). In general, 'upstream' allows
workflows where you push to branches with either a different name or
with the same name (by setting the upstream appropriately), but the
opposite is not true.
That being said, I think the mode you Michael described at least
deserves to exist, even if I disagree that it would be the best default.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2012-03-12 16:38 UTC|newest]
Thread overview: 116+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 10:01 git push default behaviour? Jeremy Morton
2012-03-08 10:11 ` Thomas Rast
2012-03-08 10:13 ` Jeremy Morton
2012-03-08 10:28 ` Carlos Martín Nieto
2012-03-08 10:38 ` Jeremy Morton
2012-03-08 10:42 ` Carlos Martín Nieto
2012-03-08 10:43 ` Jeremy Morton
2012-03-08 18:22 ` Junio C Hamano
2012-03-08 18:35 ` Matthieu Moy
2012-03-08 19:03 ` Andreas Krey
2012-03-08 19:29 ` Junio C Hamano
2012-03-09 8:05 ` Matthieu Moy
2012-03-09 9:50 ` Junio C Hamano
2012-03-09 11:28 ` Jeremy Morton
2012-03-09 11:54 ` Matthieu Moy
2012-03-09 14:42 ` Jakub Narebski
2012-03-19 6:02 ` Miles Bader
2012-03-19 16:12 ` Philippe Vaucher
2012-03-08 15:00 ` Marc Branchaud
2012-03-08 15:26 ` Matthieu Moy
2012-03-08 17:49 ` Dmitry Potapov
2012-03-08 18:04 ` Matthieu Moy
2012-03-09 3:38 ` Jeff King
2012-03-09 5:23 ` Junio C Hamano
2012-03-09 5:38 ` Junio C Hamano
2012-03-09 8:06 ` demerphq
2012-03-09 8:48 ` Thomas Rast
2012-03-09 9:50 ` Junio C Hamano
2012-03-16 9:38 ` Gelonida N
2012-03-09 8:25 ` Matthieu Moy
2012-03-09 8:31 ` [RFC PATCH] push: start warning upcoming default change for push.default Matthieu Moy
2012-03-09 10:01 ` Junio C Hamano
2012-03-09 20:21 ` Junio C Hamano
2012-03-09 10:25 ` Carlos Martín Nieto
2012-03-09 18:30 ` Marc Branchaud
2012-03-09 21:08 ` Stefan Haller
2012-03-10 21:05 ` Junio C Hamano
2012-03-11 20:26 ` Stefan Haller
2012-03-12 8:47 ` Matthieu Moy
2012-03-12 11:22 ` Stefan Haller
2012-03-12 12:46 ` Matthieu Moy
2012-03-12 16:11 ` Junio C Hamano
2012-03-12 15:10 ` Marc Branchaud
2012-03-10 6:16 ` Michael Haggerty
2012-03-12 15:13 ` Marc Branchaud
2012-03-12 16:37 ` Matthieu Moy [this message]
2012-03-12 17:53 ` Junio C Hamano
2012-03-12 18:37 ` Jeff King
2012-03-12 19:06 ` Junio C Hamano
2012-03-12 19:33 ` Junio C Hamano
2012-03-12 20:16 ` Marc Branchaud
2012-03-13 9:40 ` Matthieu Moy
2012-03-13 9:36 ` Matthieu Moy
2012-03-13 21:30 ` Jeff King
2012-03-13 22:54 ` Junio C Hamano
2012-03-14 13:50 ` Jeff King
2012-03-14 20:59 ` Junio C Hamano
2012-03-13 9:34 ` Matthieu Moy
2012-03-13 13:17 ` Junio C Hamano
2012-03-13 13:35 ` Matthieu Moy
2012-03-13 20:01 ` Auto-matching upstream branches by name (was: [RFC PATCH] push: start warning upcoming default change for push.default) Stefan Haller
2012-03-14 9:10 ` Auto-matching upstream branches by name Matthieu Moy
2012-03-13 14:31 ` [RFC PATCH] push: start warning upcoming default change for push.default Marc Branchaud
2012-03-13 14:59 ` Holger Hellmuth
2012-03-13 17:41 ` Junio C Hamano
2012-03-14 19:15 ` Holger Hellmuth
2012-03-15 8:02 ` Matthieu Moy
2012-03-15 10:43 ` Holger Hellmuth
2012-03-13 15:02 ` Andreas Ericsson
2012-03-13 21:35 ` Jeff King
2012-03-13 18:08 ` Dmitry Potapov
2012-03-14 4:46 ` Junio C Hamano
2012-03-14 12:47 ` Dmitry Potapov
2012-03-14 17:29 ` Junio C Hamano
2012-03-14 17:49 ` Dmitry Potapov
2012-03-14 20:44 ` Junio C Hamano
2012-03-14 9:07 ` Matthieu Moy
2012-03-14 13:23 ` Dmitry Potapov
2012-03-14 14:47 ` Matthieu Moy
2012-03-14 17:47 ` Dmitry Potapov
2012-03-15 8:05 ` Matthieu Moy
2012-03-14 8:59 ` Michael Haggerty
2012-03-14 14:00 ` Jeff King
2012-03-09 11:26 ` Ævar Arnfjörð Bjarmason
2012-03-16 8:51 ` Clemens Buchacher
2012-03-16 9:43 ` Matthieu Moy
2012-03-16 12:05 ` Junio C Hamano
2012-03-16 12:42 ` Matthieu Moy
2012-03-16 21:48 ` Clemens Buchacher
2012-03-17 20:46 ` Matthieu Moy
2012-03-19 16:11 ` Andrew Myers
2012-03-09 9:57 ` git push default behaviour? Junio C Hamano
2012-03-09 12:11 ` Matthieu Moy
2012-03-09 16:22 ` Junio C Hamano
2012-03-09 17:44 ` Junio C Hamano
2012-03-09 14:56 ` Jakub Narebski
2012-03-09 16:23 ` Junio C Hamano
2012-03-13 15:18 ` Jakub Narebski
2012-03-12 9:34 ` Matthieu Moy
2012-03-12 16:29 ` Junio C Hamano
2012-03-13 9:47 ` Matthieu Moy
2012-03-13 12:34 ` Junio C Hamano
2012-03-16 19:35 ` Junio C Hamano
2012-03-17 15:49 ` Eric Hanchrow
2012-03-08 17:37 ` Dmitry Potapov
2012-03-08 11:33 ` Jakub Narebski
2012-03-08 11:34 ` Jeremy Morton
2012-03-13 15:27 ` Jakub Narebski
2012-03-14 12:12 ` Jeremy Morton
2012-03-14 17:16 ` Jakub Narebski
2012-03-08 11:54 ` Matthieu Moy
2012-03-08 12:12 ` demerphq
2012-03-17 9:36 ` Sebastien Douche
2012-03-17 9:38 ` Jeremy Morton
2012-03-17 9:51 ` Sebastien Douche
2012-03-18 10:26 ` Pavel Pospíšil
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=vpqzkblixmb.fsf@bauges.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=cmn@elego.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=marcnarc@xiplink.com \
--cc=mhagger@alum.mit.edu \
/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).