From: Junio C Hamano <gitster@pobox.com>
To: Greg Jacobson <coder5000@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH v3] push: Enhance unspecified push default warning
Date: Mon, 04 Nov 2013 10:32:16 -0800 [thread overview]
Message-ID: <xmqqvc08yq4v.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAKYC+eLvx1vB1ZDqYK=7Dg68QuCojBdSAVQZMF6HBtfxu_b_aw@mail.gmail.com> (Greg Jacobson's message of "Sun, 3 Nov 2013 08:35:51 -0500")
Greg Jacobson <coder5000@gmail.com> writes:
> Is there anything I could do to improve this patch? Thank you.
My vague recollection is that we started from an excerpt from the
documentation page, not unlike this patch attempts to, but because
such an excerpt has to be less complete than the documentation for
brevity's sake, it is bound to be an incorrect and/or misleading
one, and decided that we are better off referring the users, who do
want to choose something other than the default we chose, to the
documentation.
Somebody cares to dig up the old discussion threads and post a few
pointers?
> On Fri, Oct 4, 2013 at 10:20 AM, Greg Jacobson <coder5000@gmail.com> wrote:
>> When the unset push.default warning message is displayed
>> this may be the first time many users encounter push.default.
>> Modified the warning message to explain in a compact
>> manner what push.default is and why it is being changed in
>> Git 2.0. Also provided additional information to help users
>> decide if this change will affect their workflow.
>>
>> Signed-off-by: Greg Jacobson <coder5000@gmail.com>
>> ---
>> builtin/push.c | 9 +++++++++
>> 1 file changed, 9 insertions(+)
>>
>> diff --git a/builtin/push.c b/builtin/push.c
>> index 7b1b66c..5393e28 100644
>> --- a/builtin/push.c
>> +++ b/builtin/push.c
>> @@ -174,6 +174,15 @@ N_("push.default is unset; its implicit value is
>> changing in\n"
>> "\n"
>> " git config --global push.default simple\n"
>> "\n"
>> + "When push.default is set to 'matching', git will push all local branches\n"
>> + "to the remote branches with the same (matching) name. This will no\n"
>> + "longer be the default in Git 2.0 because a branch could be\n"
>> + "unintentionally pushed to a remote.\n"
>> + "\n"
>> + "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"
>> + "\n"
>> "See 'git help config' and search for 'push.default' for further
>> information.\n"
>> "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
>> "'current' instead of 'simple' if you sometimes use older versions
>> of Git)");
>> --
>> 1.8.4.474.g128a96c.dirty
next prev parent reply other threads:[~2013-11-04 18:32 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 [this message]
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
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=xmqqvc08yq4v.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=coder5000@gmail.com \
--cc=git@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.