Re: [PATCH v3] push: Enhance unspecified push default warning

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 8, 2013, 18:56 UTC
Message-ID: <xmqqhabmoh7i.fsf@gitster.dls.corp.google.com>
In-Reply-To: <xmqqli0yojp8.fsf@gitster.dls.corp.google.com>

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

> OK, I'll tentatively update the draft to read like this, redo the
> endgame patch on top and requeue.

... and the corresponding part of the endgame patch now reads like this. I suspect that we may want a bigger change to unstress 'simple' at that phase of the transition, though, by perhaps rewording the 'matching' part to make it more explicit that the setting is primarily for those who want to keep the traditional behaviour.

diff --git a/builtin/push.c b/builtin/push.c
index 27c5754..a0534d0 100644
--- a/builtin/push.c
+++ b/builtin/push.c
 ...
@@ -164,9 +163,9 @@ static void setup_push_current(struct remote *remote, struct branch *branch)
 }
 
 static char warn_unspecified_push_default_msg[] =
-N_("push.default is unset; its implicit value is changing in\n"
+N_("push.default is unset; its implicit value has changed in\n"
    "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
-   "and maintain the current behavior after the default changes, use:\n"
+   "and maintain the traditional behavior, use:\n"
    "\n"
    "  git config --global push.default matching\n"
    "\n"
@@ -177,7 +176,7 @@ N_("push.default is unset; its implicit value is changing in\n"
    "When push.default is set to 'matching', git will push local branches\n"
    "to the remote branches that already exist with the same name.\n"
    "\n"
-   "In Git 2.0, Git will default to the more conservative 'simple'\n"
+   "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
    "behavior that only pushes the current branch to the corresponding\n"
    "remote branch used by 'git pull' to update the current branch from.\n"
    "\n"
@@ -207,14 +206,14 @@ static void setup_default_push_refspecs(struct remote *remote)
 ...