mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
push: remove "push.default is unset" warning message
The warning was important before the 2.0 transition, and remained important for a while after, so that new users get push.default explicitly in their configuration and do not experience inconsistent behavior if they ever used an older version of Git. The warning has been there since version 1.8.0 (Oct 2012), hence we can expect the vast majority of current Git users to have been exposed to it, and most of them have already set push.default explicitly. The switch from 'matching' to 'simple' was planned for 2.0 (May 2014), but actually happened only for 2.3 (Feb 2015). Today, the warning is mostly seen by beginners, who have not set their push.default configuration (yet). For many of them, the warning is confusing because it talks about concepts that they have not learned and asks them a choice that they are not able to make yet. See for example http://stackoverflow.com/questions/13148066/warning-push-default-is-unset-its-implicit-value-is-changing-in-git-2-0 (1260 votes for the question, 1824 for the answer as of writing) Remove the warning completely to avoid disturbing beginners. People who still occasionally use an older version of Git will be exposed to the warning through this old version. Eventually, versions of Git without the warning will be deployed enough and tutorials will not need to advise setting push.default anymore. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
7c0da37d7b
commit
2f275207ce
|
@ -204,37 +204,6 @@ static void setup_push_current(struct remote *remote, struct branch *branch)
|
|||
add_refspec(branch->name);
|
||||
}
|
||||
|
||||
static char warn_unspecified_push_default_msg[] =
|
||||
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 traditional behavior, use:\n"
|
||||
"\n"
|
||||
" git config --global push.default matching\n"
|
||||
"\n"
|
||||
"To squelch this message and adopt the new behavior now, use:\n"
|
||||
"\n"
|
||||
" git config --global push.default simple\n"
|
||||
"\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"
|
||||
"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"
|
||||
"\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)");
|
||||
|
||||
static void warn_unspecified_push_default_configuration(void)
|
||||
{
|
||||
static int warn_once;
|
||||
|
||||
if (warn_once++)
|
||||
return;
|
||||
warning("%s\n", _(warn_unspecified_push_default_msg));
|
||||
}
|
||||
|
||||
static int is_workflow_triangular(struct remote *remote)
|
||||
{
|
||||
struct remote *fetch_remote = remote_get(NULL);
|
||||
|
@ -253,9 +222,6 @@ static void setup_default_push_refspecs(struct remote *remote)
|
|||
break;
|
||||
|
||||
case PUSH_DEFAULT_UNSPECIFIED:
|
||||
warn_unspecified_push_default_configuration();
|
||||
/* fallthru */
|
||||
|
||||
case PUSH_DEFAULT_SIMPLE:
|
||||
if (triangular)
|
||||
setup_push_current(remote, branch);
|
||||
|
|
Loading…
Reference in a new issue