push: start warning upcoming default change for push.default
In preparation for flipping the default to the "simple" mode from the "matching" mode that is the historical default, start warning users when they rely on unconfigured "git push" to default to the "matching" mode. Also, advertise for 'simple' where 'current' and 'upstream' are advised. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy committed
Jun 24, 2012 at 13:01 UTC
f2c2c90103eaff6f39a289c15b9dbc06efaaf2a8
2 files changed
+31
-3
builtin/push.c
+27
-2
@@ -147,12 +147,37 @@ static void setup_push_upstream(struct remote *remote, int simple)
147
add_refspec(refspec.buf);
148
}
149
150
+static char warn_unspecified_push_default_msg[] =
151
+N_("push.default is unset; its implicit value is changing in\n"
152
+ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
153
+ "and maintain the current behavior after the default changes, use:\n"
154
+ "\n"
155
+ " git config --global push.default matching\n"
156
+ "\n"
157
+ "To squelch this message and adopt the new behavior now, use:\n"
158
+ "\n"
159
+ " git config --global push.default simple\n"
160
+ "\n"
161
+ "See 'git help config' and search for 'push.default' for further information.\n"
162
+ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
163
+ "'current' instead of 'simple' if you sometimes use older versions of Git)");
164
+
165
+static void warn_unspecified_push_default_configuration(void)
166
+{
167
+ static int warn_once;
168
+
169
+ if (warn_once++)
170
+ return;
171
+ warning("%s\n", _(warn_unspecified_push_default_msg));
172
+}
173
+
174
static void setup_default_push_refspecs(struct remote *remote)
175
{
176
switch (push_default) {
177
default:
178
case PUSH_DEFAULT_UNSPECIFIED:
179
default_matching_used = 1;
180
+ warn_unspecified_push_default_configuration();
181
/* fallthru */
182
case PUSH_DEFAULT_MATCHING:
183
add_refspec(":");
@@ -186,8 +211,8 @@ static const char message_advice_pull_before_push[] =
211
static const char message_advice_use_upstream[] =
212
N_("Updates were rejected because a pushed branch tip is behind its remote\n"
213
"counterpart. If you did not intend to push that branch, you may want to\n"
189
- "specify branches to push or set the 'push.default' configuration\n"
190
- "variable to 'current' or 'upstream' to push only the current branch.");
214
+ "specify branches to push or set the 'push.default' configuration variable\n"
215
+ "to 'simple', 'current' or 'upstream' to push only the current branch.");
216
217
static const char message_advice_checkout_pull_push[] =
218
N_("Updates were rejected because a pushed branch tip is behind its remote\n"
t/t5541-http-push.sh
+4
-1
@@ -64,7 +64,10 @@ test_expect_success 'no empty path components' '
64
65
test_expect_success 'clone remote repository' '
66
rm -rf test_repo_clone &&
67
- git clone $HTTPD_URL/smart/test_repo.git test_repo_clone
67
+ git clone $HTTPD_URL/smart/test_repo.git test_repo_clone &&
68
+ (
69
+ cd test_repo_clone && git config push.default matching
70
+ )
71
'
72
73
test_expect_success 'push to remote repository (standard)' '