Display warning for default git push with no push.default config
If a git push without any refspecs is attempted, display a warning. The current default behavior is to push all matching refspecs, which may come as a surprise to new users, so the warning shows how push.default can be configured and what the possible values are. Traditionalists who wish to keep the current behaviour are also told how to configure this once and never see the warning again. Signed-off-by: Finn Arne Gangstad <finnag@pvv.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Finn Arne Gangstad committed
Mar 16, 2009 at 16:42 UTC
665d3e8f057b90d7b43d70db75b9ac5506bd204d
2 files changed
+30
Documentation/RelNotes-1.6.3.txt
+7
@@ -22,6 +22,13 @@ branch pointed at by its HEAD, gets a large warning. You can choose what
22
should happen upon such a push by setting the configuration variable
23
receive.denyDeleteCurrent in the receiving repository.
24
25
+In a future release, the default of "git push" without further
26
+arguments might be changed. Currently, it will push all matching
27
+refspecs to the current remote. A configuration variable push.default
28
+has been introduced to select the default behaviour. To ease the
29
+transition, a big warning is issued if this is not configured and a
30
+git push without arguments is attempted.
31
+
32
33
Updates since v1.6.2
34
--------------------
builtin-push.c
+23
@@ -64,11 +64,34 @@ static void setup_push_tracking(void)
64
add_refspec(refspec.buf);
65
}
66
67
+static const char *warn_unconfigured_push_msg[] = {
68
+ "You did not specify any refspecs to push, and the current remote",
69
+ "has not configured any push refspecs. The default action in this",
70
+ "case is to push all matching refspecs, that is, all branches",
71
+ "that exist both locally and remotely will be updated. This may",
72
+ "not necessarily be what you want to happen.",
73
+ "",
74
+ "You can specify what action you want to take in this case, and",
75
+ "avoid seeing this message again, by configuring 'push.default' to:",
76
+ " 'nothing' : Do not push anythig",
77
+ " 'matching' : Push all matching branches (default)",
78
+ " 'tracking' : Push the current branch to whatever it is tracking",
79
+ " 'current' : Push the current branch"
80
+};
81
+
82
+static void warn_unconfigured_push(void)
83
+{
84
+ int i;
85
+ for (i = 0; i < ARRAY_SIZE(warn_unconfigured_push_msg); i++)
86
+ warning("%s", warn_unconfigured_push_msg[i]);
87
+}
88
+
89
static void setup_default_push_refspecs(void)
90
{
91
git_config(git_default_config, NULL);
92
switch (push_default) {
93
case PUSH_DEFAULT_UNSPECIFIED:
94
+ warn_unconfigured_push();
95
/* fallthrough */
96
97
case PUSH_DEFAULT_MATCHING: