From: Jeff King <peff@peff•net>
To: Adam Williamson <awilliam@redhat•com>
Cc: Ramkumar Ramachandra <artagnon@gmail•com>,
Junio C Hamano <gitster@pobox•com>,
git@vger•kernel.org
Subject: Re: 'simple' push check that branch name matches does not work if push.default is unset (and hence implicitly simple)
Date: Thu, 27 Nov 2014 23:55:18 -0500 [thread overview]
Message-ID: <20141128045518.GB19456@peff.net> (raw)
In-Reply-To: <1417108347.18654.4.camel@redhat.com>
On Thu, Nov 27, 2014 at 09:12:27AM -0800, Adam Williamson wrote:
> It might also be worth improving the warn_unspecified_push_default_msg[]
> text to mention the name matching behaviour? At present it doesn't
> clearly explain this (you could argue it's *sort of* implied, but I
> doubt many people will read it that way - I didn't), you have to follow
> the chain into 'git help config' to find the description. Something
> like:
>
> "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
> "behavior, which only pushes the current branch to the corresponding\n"
> "remote branch that 'git pull' uses to update the current branch, \n"
> "if the names of those two branches match.\n"
Yeah, I agree that is more clear.
There is some other magic with "simple", too, around triangular
workflows. Describing it in detail would probably be too verbose in this
message, but we do refer to the description of push.default, which is
probably enough. Technically this new bit you are adding here is
covered there, too. But since we can improve the description by adding
such a small amount of text in this case, it seems like a reasonable
tradeoff.
I suppose we could also customize the message based on the triangular
and non-triangular cases. I dunno.
-Peff
next prev parent reply other threads:[~2014-11-28 4:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-26 22:29 'simple' push check that branch name matches does not work if push.default is unset (and hence implicitly simple) Adam Williamson
2014-11-26 22:38 ` Adam Williamson
2014-11-27 3:43 ` Jeff King
2014-11-27 4:24 ` Adam Williamson
2014-11-27 17:12 ` Adam Williamson
2014-11-28 4:55 ` Jeff King [this message]
2014-12-01 2:21 ` 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=20141128045518.GB19456@peff.net \
--to=peff@peff$(echo .)net \
--cc=artagnon@gmail$(echo .)com \
--cc=awilliam@redhat$(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