]>
Commit | Line | Data |
---|---|---|
755225de LT |
1 | /* |
2 | * "git push" | |
3 | */ | |
4 | #include "cache.h" | |
5 | #include "refs.h" | |
6 | #include "run-command.h" | |
7 | #include "builtin.h" | |
5751f490 | 8 | #include "remote.h" |
9b288516 | 9 | #include "transport.h" |
378c4832 | 10 | #include "parse-options.h" |
d2b17b32 | 11 | #include "submodule.h" |
755225de | 12 | |
378c4832 | 13 | static const char * const push_usage[] = { |
78dafaa5 | 14 | N_("git push [<options>] [<repository> [<refspec>...]]"), |
378c4832 DB |
15 | NULL, |
16 | }; | |
755225de | 17 | |
c29c1b40 | 18 | static int thin; |
f517f1f2 | 19 | static int deleterefs; |
d23842fd | 20 | static const char *receivepack; |
8afd8dc0 | 21 | static int verbosity; |
01fdc21f | 22 | static int progress = -1; |
755225de | 23 | |
96f1e58f DR |
24 | static const char **refspec; |
25 | static int refspec_nr; | |
8a883b02 | 26 | static int refspec_alloc; |
f25950f3 | 27 | static int default_matching_used; |
755225de LT |
28 | |
29 | static void add_refspec(const char *ref) | |
30 | { | |
8a883b02 JH |
31 | refspec_nr++; |
32 | ALLOC_GROW(refspec, refspec_nr, refspec_alloc); | |
33 | refspec[refspec_nr-1] = ref; | |
755225de LT |
34 | } |
35 | ||
755225de LT |
36 | static void set_refspecs(const char **refs, int nr) |
37 | { | |
8558fd9e DB |
38 | int i; |
39 | for (i = 0; i < nr; i++) { | |
40 | const char *ref = refs[i]; | |
41 | if (!strcmp("tag", ref)) { | |
42 | char *tag; | |
43 | int len; | |
44 | if (nr <= ++i) | |
8352d29e | 45 | die(_("tag shorthand without <tag>")); |
8558fd9e | 46 | len = strlen(refs[i]) + 11; |
f517f1f2 JK |
47 | if (deleterefs) { |
48 | tag = xmalloc(len+1); | |
49 | strcpy(tag, ":refs/tags/"); | |
50 | } else { | |
51 | tag = xmalloc(len); | |
52 | strcpy(tag, "refs/tags/"); | |
53 | } | |
8558fd9e DB |
54 | strcat(tag, refs[i]); |
55 | ref = tag; | |
f517f1f2 JK |
56 | } else if (deleterefs && !strchr(ref, ':')) { |
57 | char *delref; | |
58 | int len = strlen(ref)+1; | |
7b48c170 | 59 | delref = xmalloc(len+1); |
f517f1f2 JK |
60 | strcpy(delref, ":"); |
61 | strcat(delref, ref); | |
62 | ref = delref; | |
63 | } else if (deleterefs) | |
8352d29e | 64 | die(_("--delete only accepts plain target ref names")); |
8558fd9e | 65 | add_refspec(ref); |
755225de | 66 | } |
755225de LT |
67 | } |
68 | ||
135dadef JH |
69 | static int push_url_of_remote(struct remote *remote, const char ***url_p) |
70 | { | |
71 | if (remote->pushurl_nr) { | |
72 | *url_p = remote->pushurl; | |
73 | return remote->pushurl_nr; | |
74 | } | |
75 | *url_p = remote->url; | |
76 | return remote->url_nr; | |
77 | } | |
78 | ||
b55e6775 MM |
79 | static NORETURN int die_push_simple(struct branch *branch, struct remote *remote) { |
80 | /* | |
81 | * There's no point in using shorten_unambiguous_ref here, | |
82 | * as the ambiguity would be on the remote side, not what | |
83 | * we have locally. Plus, this is supposed to be the simple | |
84 | * mode. If the user is doing something crazy like setting | |
85 | * upstream to a non-branch, we should probably be showing | |
86 | * them the big ugly fully qualified ref. | |
87 | */ | |
88 | const char *advice_maybe = ""; | |
89 | const char *short_upstream = | |
90 | skip_prefix(branch->merge[0]->src, "refs/heads/"); | |
91 | ||
92 | if (!short_upstream) | |
93 | short_upstream = branch->merge[0]->src; | |
94 | /* | |
95 | * Don't show advice for people who explicitely set | |
96 | * push.default. | |
97 | */ | |
98 | if (push_default == PUSH_DEFAULT_UNSPECIFIED) | |
99 | advice_maybe = _("\n" | |
100 | "To choose either option permanently, " | |
101 | "see push.default in 'git help config'."); | |
102 | die(_("The upstream branch of your current branch does not match\n" | |
103 | "the name of your current branch. To push to the upstream branch\n" | |
104 | "on the remote, use\n" | |
105 | "\n" | |
106 | " git push %s HEAD:%s\n" | |
107 | "\n" | |
108 | "To push to the branch of the same name on the remote, use\n" | |
109 | "\n" | |
110 | " git push %s %s\n" | |
111 | "%s"), | |
112 | remote->name, short_upstream, | |
113 | remote->name, branch->name, advice_maybe); | |
114 | } | |
115 | ||
116 | static void setup_push_upstream(struct remote *remote, int simple) | |
52153747 FAG |
117 | { |
118 | struct strbuf refspec = STRBUF_INIT; | |
119 | struct branch *branch = branch_get(NULL); | |
120 | if (!branch) | |
6c80cd29 | 121 | die(_("You are not currently on a branch.\n" |
ec8460bd MM |
122 | "To push the history leading to the current (detached HEAD)\n" |
123 | "state now, use\n" | |
124 | "\n" | |
6c80cd29 | 125 | " git push %s HEAD:<name-of-remote-branch>\n"), |
ec8460bd | 126 | remote->name); |
135dadef | 127 | if (!branch->merge_nr || !branch->merge || !branch->remote_name) |
6c80cd29 | 128 | die(_("The current branch %s has no upstream branch.\n" |
ec8460bd MM |
129 | "To push the current branch and set the remote as upstream, use\n" |
130 | "\n" | |
6c80cd29 | 131 | " git push --set-upstream %s %s\n"), |
ec8460bd MM |
132 | branch->name, |
133 | remote->name, | |
52153747 FAG |
134 | branch->name); |
135 | if (branch->merge_nr != 1) | |
6c80cd29 | 136 | die(_("The current branch %s has multiple upstream branches, " |
8352d29e | 137 | "refusing to push."), branch->name); |
135dadef JH |
138 | if (strcmp(branch->remote_name, remote->name)) |
139 | die(_("You are pushing to remote '%s', which is not the upstream of\n" | |
140 | "your current branch '%s', without telling me what to push\n" | |
141 | "to update which remote branch."), | |
142 | remote->name, branch->name); | |
b55e6775 MM |
143 | if (simple && strcmp(branch->refname, branch->merge[0]->src)) |
144 | die_push_simple(branch, remote); | |
135dadef | 145 | |
52153747 FAG |
146 | strbuf_addf(&refspec, "%s:%s", branch->name, branch->merge[0]->src); |
147 | add_refspec(refspec.buf); | |
148 | } | |
149 | ||
f2c2c901 MM |
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 | ||
ec8460bd | 174 | static void setup_default_push_refspecs(struct remote *remote) |
52153747 | 175 | { |
52153747 | 176 | switch (push_default) { |
bba0fd22 | 177 | default: |
f25950f3 CT |
178 | case PUSH_DEFAULT_UNSPECIFIED: |
179 | default_matching_used = 1; | |
f2c2c901 | 180 | warn_unspecified_push_default_configuration(); |
f25950f3 | 181 | /* fallthru */ |
52153747 FAG |
182 | case PUSH_DEFAULT_MATCHING: |
183 | add_refspec(":"); | |
184 | break; | |
185 | ||
b55e6775 MM |
186 | case PUSH_DEFAULT_SIMPLE: |
187 | setup_push_upstream(remote, 1); | |
188 | break; | |
189 | ||
53c40311 | 190 | case PUSH_DEFAULT_UPSTREAM: |
b55e6775 | 191 | setup_push_upstream(remote, 0); |
52153747 FAG |
192 | break; |
193 | ||
194 | case PUSH_DEFAULT_CURRENT: | |
195 | add_refspec("HEAD"); | |
196 | break; | |
197 | ||
198 | case PUSH_DEFAULT_NOTHING: | |
8352d29e ÆAB |
199 | die(_("You didn't specify any refspecs to push, and " |
200 | "push.default is \"nothing\".")); | |
52153747 FAG |
201 | break; |
202 | } | |
203 | } | |
204 | ||
f25950f3 CT |
205 | static const char message_advice_pull_before_push[] = |
206 | N_("Updates were rejected because the tip of your current branch is behind\n" | |
207 | "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" | |
208 | "before pushing again.\n" | |
209 | "See the 'Note about fast-forwards' in 'git push --help' for details."); | |
210 | ||
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" | |
f2c2c901 MM |
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."); | |
f25950f3 CT |
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" | |
219 | "counterpart. Check out this branch and merge the remote changes\n" | |
220 | "(e.g. 'git pull') before pushing again.\n" | |
221 | "See the 'Note about fast-forwards' in 'git push --help' for details."); | |
222 | ||
b24e6047 CR |
223 | static const char message_advice_ref_already_exists[] = |
224 | N_("Updates were rejected because the destination reference already exists\n" | |
dbfeddb1 | 225 | "in the remote."); |
b24e6047 | 226 | |
f25950f3 CT |
227 | static void advise_pull_before_push(void) |
228 | { | |
229 | if (!advice_push_non_ff_current || !advice_push_nonfastforward) | |
230 | return; | |
231 | advise(_(message_advice_pull_before_push)); | |
232 | } | |
233 | ||
234 | static void advise_use_upstream(void) | |
235 | { | |
236 | if (!advice_push_non_ff_default || !advice_push_nonfastforward) | |
237 | return; | |
238 | advise(_(message_advice_use_upstream)); | |
239 | } | |
240 | ||
241 | static void advise_checkout_pull_push(void) | |
242 | { | |
243 | if (!advice_push_non_ff_matching || !advice_push_nonfastforward) | |
244 | return; | |
245 | advise(_(message_advice_checkout_pull_push)); | |
246 | } | |
247 | ||
b24e6047 CR |
248 | static void advise_ref_already_exists(void) |
249 | { | |
250 | advise(_(message_advice_ref_already_exists)); | |
251 | } | |
252 | ||
fb0cc87e DB |
253 | static int push_with_options(struct transport *transport, int flags) |
254 | { | |
255 | int err; | |
10643d4e | 256 | unsigned int reject_reasons; |
8afd8dc0 | 257 | |
78381069 | 258 | transport_set_verbosity(transport, verbosity, progress); |
8afd8dc0 | 259 | |
fb0cc87e DB |
260 | if (receivepack) |
261 | transport_set_option(transport, | |
262 | TRANS_OPT_RECEIVEPACK, receivepack); | |
263 | if (thin) | |
264 | transport_set_option(transport, TRANS_OPT_THIN, "yes"); | |
265 | ||
8afd8dc0 | 266 | if (verbosity > 0) |
8352d29e | 267 | fprintf(stderr, _("Pushing to %s\n"), transport->url); |
fb0cc87e | 268 | err = transport_push(transport, refspec_nr, refspec, flags, |
10643d4e | 269 | &reject_reasons); |
53970b92 | 270 | if (err != 0) |
8352d29e | 271 | error(_("failed to push some refs to '%s'"), transport->url); |
53970b92 | 272 | |
fb0cc87e | 273 | err |= transport_disconnect(transport); |
fb0cc87e DB |
274 | if (!err) |
275 | return 0; | |
276 | ||
10643d4e | 277 | if (reject_reasons & REJECT_NON_FF_HEAD) { |
f25950f3 | 278 | advise_pull_before_push(); |
10643d4e | 279 | } else if (reject_reasons & REJECT_NON_FF_OTHER) { |
f25950f3 CT |
280 | if (default_matching_used) |
281 | advise_use_upstream(); | |
282 | else | |
283 | advise_checkout_pull_push(); | |
b24e6047 CR |
284 | } else if (reject_reasons & REJECT_ALREADY_EXISTS) { |
285 | advise_ref_already_exists(); | |
fb0cc87e DB |
286 | } |
287 | ||
288 | return 1; | |
289 | } | |
290 | ||
9b288516 | 291 | static int do_push(const char *repo, int flags) |
755225de | 292 | { |
5751f490 | 293 | int i, errs; |
5751f490 | 294 | struct remote *remote = remote_get(repo); |
20346234 MG |
295 | const char **url; |
296 | int url_nr; | |
755225de | 297 | |
fa685bdf DB |
298 | if (!remote) { |
299 | if (repo) | |
8352d29e | 300 | die(_("bad repository '%s'"), repo); |
6c80cd29 | 301 | die(_("No configured push destination.\n" |
a3f5e7a3 MM |
302 | "Either specify the URL from the command-line or configure a remote repository using\n" |
303 | "\n" | |
304 | " git remote add <name> <url>\n" | |
305 | "\n" | |
306 | "and then push using the remote name\n" | |
307 | "\n" | |
6c80cd29 | 308 | " git push <name>\n")); |
fa685bdf | 309 | } |
755225de | 310 | |
84bb2dfd PB |
311 | if (remote->mirror) |
312 | flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE); | |
313 | ||
b259f09b MZ |
314 | if ((flags & TRANSPORT_PUSH_ALL) && refspec) { |
315 | if (!strcmp(*refspec, "refs/tags/*")) | |
8352d29e ÆAB |
316 | return error(_("--all and --tags are incompatible")); |
317 | return error(_("--all can't be combined with refspecs")); | |
b259f09b MZ |
318 | } |
319 | ||
320 | if ((flags & TRANSPORT_PUSH_MIRROR) && refspec) { | |
321 | if (!strcmp(*refspec, "refs/tags/*")) | |
8352d29e ÆAB |
322 | return error(_("--mirror and --tags are incompatible")); |
323 | return error(_("--mirror can't be combined with refspecs")); | |
b259f09b | 324 | } |
84bb2dfd PB |
325 | |
326 | if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) == | |
327 | (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) { | |
8352d29e | 328 | return error(_("--all and --mirror are incompatible")); |
84bb2dfd PB |
329 | } |
330 | ||
52153747 FAG |
331 | if (!refspec && !(flags & TRANSPORT_PUSH_ALL)) { |
332 | if (remote->push_refspec_nr) { | |
333 | refspec = remote->push_refspec; | |
334 | refspec_nr = remote->push_refspec_nr; | |
335 | } else if (!(flags & TRANSPORT_PUSH_MIRROR)) | |
ec8460bd | 336 | setup_default_push_refspecs(remote); |
5751f490 | 337 | } |
fd1d1b05 | 338 | errs = 0; |
135dadef | 339 | url_nr = push_url_of_remote(remote, &url); |
fb0cc87e DB |
340 | if (url_nr) { |
341 | for (i = 0; i < url_nr; i++) { | |
342 | struct transport *transport = | |
343 | transport_get(remote, url[i]); | |
344 | if (push_with_options(transport, flags)) | |
345 | errs++; | |
07436e43 | 346 | } |
fb0cc87e DB |
347 | } else { |
348 | struct transport *transport = | |
349 | transport_get(remote, NULL); | |
350 | ||
351 | if (push_with_options(transport, flags)) | |
352 | errs++; | |
755225de | 353 | } |
fd1d1b05 | 354 | return !!errs; |
755225de LT |
355 | } |
356 | ||
d2b17b32 FG |
357 | static int option_parse_recurse_submodules(const struct option *opt, |
358 | const char *arg, int unset) | |
359 | { | |
360 | int *flags = opt->value; | |
eb21c732 HV |
361 | |
362 | if (*flags & (TRANSPORT_RECURSE_SUBMODULES_CHECK | | |
363 | TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND)) | |
364 | die("%s can only be used once.", opt->long_name); | |
365 | ||
d2b17b32 FG |
366 | if (arg) { |
367 | if (!strcmp(arg, "check")) | |
368 | *flags |= TRANSPORT_RECURSE_SUBMODULES_CHECK; | |
eb21c732 HV |
369 | else if (!strcmp(arg, "on-demand")) |
370 | *flags |= TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND; | |
d2b17b32 FG |
371 | else |
372 | die("bad %s argument: %s", opt->long_name, arg); | |
373 | } else | |
eb21c732 HV |
374 | die("option %s needs an argument (check|on-demand)", |
375 | opt->long_name); | |
d2b17b32 FG |
376 | |
377 | return 0; | |
378 | } | |
379 | ||
a633fca0 | 380 | int cmd_push(int argc, const char **argv, const char *prefix) |
755225de | 381 | { |
9b288516 | 382 | int flags = 0; |
378c4832 | 383 | int tags = 0; |
84bb2dfd | 384 | int rc; |
5751f490 | 385 | const char *repo = NULL; /* default repository */ |
378c4832 | 386 | struct option options[] = { |
8afd8dc0 | 387 | OPT__VERBOSITY(&verbosity), |
78dafaa5 NTND |
388 | OPT_STRING( 0 , "repo", &repo, N_("repository"), N_("repository")), |
389 | OPT_BIT( 0 , "all", &flags, N_("push all refs"), TRANSPORT_PUSH_ALL), | |
390 | OPT_BIT( 0 , "mirror", &flags, N_("mirror all refs"), | |
c29c1b40 | 391 | (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)), |
78dafaa5 NTND |
392 | OPT_BOOLEAN( 0, "delete", &deleterefs, N_("delete refs")), |
393 | OPT_BOOLEAN( 0 , "tags", &tags, N_("push tags (can't be used with --all or --mirror)")), | |
394 | OPT_BIT('n' , "dry-run", &flags, N_("dry run"), TRANSPORT_PUSH_DRY_RUN), | |
395 | OPT_BIT( 0, "porcelain", &flags, N_("machine-readable output"), TRANSPORT_PUSH_PORCELAIN), | |
396 | OPT_BIT('f', "force", &flags, N_("force updates"), TRANSPORT_PUSH_FORCE), | |
397 | { OPTION_CALLBACK, 0, "recurse-submodules", &flags, N_("check"), | |
f63cf8c9 | 398 | N_("control recursive pushing of submodules"), |
d2b17b32 | 399 | PARSE_OPT_OPTARG, option_parse_recurse_submodules }, |
78dafaa5 NTND |
400 | OPT_BOOLEAN( 0 , "thin", &thin, N_("use thin pack")), |
401 | OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", N_("receive pack program")), | |
402 | OPT_STRING( 0 , "exec", &receivepack, "receive-pack", N_("receive pack program")), | |
403 | OPT_BIT('u', "set-upstream", &flags, N_("set upstream for git pull/status"), | |
e9fcd1e2 | 404 | TRANSPORT_PUSH_SET_UPSTREAM), |
78dafaa5 NTND |
405 | OPT_BOOL(0, "progress", &progress, N_("force progress reporting")), |
406 | OPT_BIT(0, "prune", &flags, N_("prune locally removed refs"), | |
6ddba5e2 | 407 | TRANSPORT_PUSH_PRUNE), |
378c4832 DB |
408 | OPT_END() |
409 | }; | |
755225de | 410 | |
bbc30f99 | 411 | packet_trace_identity("push"); |
2aae905f | 412 | git_config(git_default_config, NULL); |
37782920 | 413 | argc = parse_options(argc, argv, prefix, options, push_usage, 0); |
378c4832 | 414 | |
f517f1f2 | 415 | if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR)))) |
8352d29e | 416 | die(_("--delete is incompatible with --all, --mirror and --tags")); |
f517f1f2 | 417 | if (deleterefs && argc < 2) |
8352d29e | 418 | die(_("--delete doesn't make sense without any refs")); |
f517f1f2 | 419 | |
378c4832 DB |
420 | if (tags) |
421 | add_refspec("refs/tags/*"); | |
378c4832 DB |
422 | |
423 | if (argc > 0) { | |
424 | repo = argv[0]; | |
425 | set_refspecs(argv + 1, argc - 1); | |
755225de | 426 | } |
8558fd9e | 427 | |
84bb2dfd PB |
428 | rc = do_push(repo, flags); |
429 | if (rc == -1) | |
94c89ba6 | 430 | usage_with_options(push_usage, options); |
84bb2dfd PB |
431 | else |
432 | return rc; | |
755225de | 433 | } |