public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
To: Junio C Hamano <gitster@pobox•com>
Cc: Greg Jacobson <coder5000@gmail•com>,
	Git Mailing List <git@vger•kernel.org>
Subject: Re: [PATCH v3] push: Enhance unspecified push default warning
Date: Wed, 06 Nov 2013 22:49:30 +0100	[thread overview]
Message-ID: <vpq1u2tb3px.fsf@anie.imag.fr> (raw)
In-Reply-To: <xmqqk3gl8id0.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Wed, 06 Nov 2013 11:01:31 -0800")

Junio C Hamano <gitster@pobox•com> writes:

> That is true, but does it justify giving a misleading information in
> the advice message?

Clearly, yes. Trying to be exhaustive here is not a good idea, we'd end
up rewritting the man page, and then users won't read the message
because it's too long.

> Specifically:
>
>>> +   "When push.default is set to 'matching', git will push all local branches\n"
>>> +   "to the remote branches with the same (matching) name.
>
> invites those who do not read documentation to mistake it with using
> an explicit "refs/heads/*:refs/heads/*" refspec.

Yes, but those who want to know the exact behavior should read the doc.
That's life.

>>> +   "In Git 2.0 the new push.default of 'simple' will push only the current\n"
>>> +   "branch to the same remote branch used by git pull.   A push will\n"
>>> +   "only succeed if the remote and local branches have the same name.\n"
>
> while you can see that it is not telling a lie if you read it twice,
> "will only succeed if" feels somewhat roundabout.
>
> 	... push only the current branch back to the branch of the
> 	same name, but only if 'git pull' is set to pull from that
> 	branch. Otherwise the push will fail.
>
> might be an improvement, but I dunno.

I do not see much difference actually. I tend to prefer the original
version: to me the expected behavior is to make push and pull
essentially symetrical, and the fact that it fails if the branch is
named differently is a safety feature comming on top of that.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

  parent reply	other threads:[~2013-11-06 21:50 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-04 14:20 [PATCH v3] push: Enhance unspecified push default warning Greg Jacobson
2013-11-03 13:35 ` Greg Jacobson
2013-11-04 18:32   ` Junio C Hamano
2013-11-05 10:16     ` Matthieu Moy
2013-11-05 10:16     ` Matthieu Moy
2013-11-06 19:01       ` Junio C Hamano
2013-11-06 20:10         ` Junio C Hamano
2013-11-06 22:55           ` Junio C Hamano
2013-11-06 21:49         ` Matthieu Moy [this message]
2013-11-06 23:45           ` Jonathan Nieder
2013-11-07 10:52             ` Matthieu Moy
2013-11-07 18:14               ` Junio C Hamano
2013-11-07 18:51                 ` Matthieu Moy
2013-11-08 18:02               ` Junio C Hamano
2013-11-08 18:56                 ` Junio C Hamano
2013-11-08 22:39                 ` Marc Branchaud
2013-11-11 17:02                   ` Junio C Hamano
2013-11-11 17:03                     ` Jonathan Nieder
2013-11-11 17:17                     ` Marc Branchaud
2013-11-11 21:12                     ` Matthieu Moy

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=vpq1u2tb3px.fsf@anie.imag.fr \
    --to=matthieu.moy@grenoble-inp$(echo .)fr \
    --cc=coder5000@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=gitster@pobox$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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