6 #include "run-command.h"
10 #include "parse-options.h"
11 #include "submodule.h"
13 static const char * const push_usage
[] = {
14 N_("git push [<options>] [<repository> [<refspec>...]]"),
19 static int deleterefs
;
20 static const char *receivepack
;
22 static int progress
= -1;
24 static const char **refspec
;
25 static int refspec_nr
;
26 static int refspec_alloc
;
27 static int default_matching_used
;
29 static void add_refspec(const char *ref
)
32 ALLOC_GROW(refspec
, refspec_nr
, refspec_alloc
);
33 refspec
[refspec_nr
-1] = ref
;
36 static void set_refspecs(const char **refs
, int nr
)
39 for (i
= 0; i
< nr
; i
++) {
40 const char *ref
= refs
[i
];
41 if (!strcmp("tag", ref
)) {
45 die(_("tag shorthand without <tag>"));
46 len
= strlen(refs
[i
]) + 11;
49 strcpy(tag
, ":refs/tags/");
52 strcpy(tag
, "refs/tags/");
56 } else if (deleterefs
&& !strchr(ref
, ':')) {
58 int len
= strlen(ref
)+1;
59 delref
= xmalloc(len
+1);
63 } else if (deleterefs
)
64 die(_("--delete only accepts plain target ref names"));
69 static int push_url_of_remote(struct remote
*remote
, const char ***url_p
)
71 if (remote
->pushurl_nr
) {
72 *url_p
= remote
->pushurl
;
73 return remote
->pushurl_nr
;
76 return remote
->url_nr
;
79 static NORETURN
int die_push_simple(struct branch
*branch
, struct remote
*remote
) {
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.
88 const char *advice_maybe
= "";
89 const char *short_upstream
=
90 skip_prefix(branch
->merge
[0]->src
, "refs/heads/");
93 short_upstream
= branch
->merge
[0]->src
;
95 * Don't show advice for people who explicitely set
98 if (push_default
== PUSH_DEFAULT_UNSPECIFIED
)
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"
106 " git push %s HEAD:%s\n"
108 "To push to the branch of the same name on the remote, use\n"
112 remote
->name
, short_upstream
,
113 remote
->name
, branch
->name
, advice_maybe
);
116 static void setup_push_upstream(struct remote
*remote
, int simple
)
118 struct strbuf refspec
= STRBUF_INIT
;
119 struct branch
*branch
= branch_get(NULL
);
121 die(_("You are not currently on a branch.\n"
122 "To push the history leading to the current (detached HEAD)\n"
125 " git push %s HEAD:<name-of-remote-branch>\n"),
127 if (!branch
->merge_nr
|| !branch
->merge
|| !branch
->remote_name
)
128 die(_("The current branch %s has no upstream branch.\n"
129 "To push the current branch and set the remote as upstream, use\n"
131 " git push --set-upstream %s %s\n"),
135 if (branch
->merge_nr
!= 1)
136 die(_("The current branch %s has multiple upstream branches, "
137 "refusing to push."), branch
->name
);
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
);
143 if (simple
&& strcmp(branch
->refname
, branch
->merge
[0]->src
))
144 die_push_simple(branch
, remote
);
146 strbuf_addf(&refspec
, "%s:%s", branch
->name
, branch
->merge
[0]->src
);
147 add_refspec(refspec
.buf
);
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"
155 " git config --global push.default matching\n"
157 "To squelch this message and adopt the new behavior now, use:\n"
159 " git config --global push.default simple\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)");
165 static void warn_unspecified_push_default_configuration(void)
167 static int warn_once
;
171 warning("%s\n", _(warn_unspecified_push_default_msg
));
174 static void setup_default_push_refspecs(struct remote
*remote
)
176 switch (push_default
) {
178 case PUSH_DEFAULT_UNSPECIFIED
:
179 default_matching_used
= 1;
180 warn_unspecified_push_default_configuration();
182 case PUSH_DEFAULT_MATCHING
:
186 case PUSH_DEFAULT_SIMPLE
:
187 setup_push_upstream(remote
, 1);
190 case PUSH_DEFAULT_UPSTREAM
:
191 setup_push_upstream(remote
, 0);
194 case PUSH_DEFAULT_CURRENT
:
198 case PUSH_DEFAULT_NOTHING
:
199 die(_("You didn't specify any refspecs to push, and "
200 "push.default is \"nothing\"."));
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.");
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"
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.");
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.");
223 static const char message_advice_ref_already_exists
[] =
224 N_("Updates were rejected because the destination reference already exists\n"
227 static void advise_pull_before_push(void)
229 if (!advice_push_non_ff_current
|| !advice_push_update_rejected
)
231 advise(_(message_advice_pull_before_push
));
234 static void advise_use_upstream(void)
236 if (!advice_push_non_ff_default
|| !advice_push_update_rejected
)
238 advise(_(message_advice_use_upstream
));
241 static void advise_checkout_pull_push(void)
243 if (!advice_push_non_ff_matching
|| !advice_push_update_rejected
)
245 advise(_(message_advice_checkout_pull_push
));
248 static void advise_ref_already_exists(void)
250 advise(_(message_advice_ref_already_exists
));
253 static int push_with_options(struct transport
*transport
, int flags
)
256 unsigned int reject_reasons
;
258 transport_set_verbosity(transport
, verbosity
, progress
);
261 transport_set_option(transport
,
262 TRANS_OPT_RECEIVEPACK
, receivepack
);
264 transport_set_option(transport
, TRANS_OPT_THIN
, "yes");
267 fprintf(stderr
, _("Pushing to %s\n"), transport
->url
);
268 err
= transport_push(transport
, refspec_nr
, refspec
, flags
,
271 error(_("failed to push some refs to '%s'"), transport
->url
);
273 err
|= transport_disconnect(transport
);
277 if (reject_reasons
& REJECT_NON_FF_HEAD
) {
278 advise_pull_before_push();
279 } else if (reject_reasons
& REJECT_NON_FF_OTHER
) {
280 if (default_matching_used
)
281 advise_use_upstream();
283 advise_checkout_pull_push();
284 } else if (reject_reasons
& REJECT_ALREADY_EXISTS
) {
285 advise_ref_already_exists();
291 static int do_push(const char *repo
, int flags
)
294 struct remote
*remote
= remote_get(repo
);
300 die(_("bad repository '%s'"), repo
);
301 die(_("No configured push destination.\n"
302 "Either specify the URL from the command-line or configure a remote repository using\n"
304 " git remote add <name> <url>\n"
306 "and then push using the remote name\n"
308 " git push <name>\n"));
312 flags
|= (TRANSPORT_PUSH_MIRROR
|TRANSPORT_PUSH_FORCE
);
314 if ((flags
& TRANSPORT_PUSH_ALL
) && refspec
) {
315 if (!strcmp(*refspec
, "refs/tags/*"))
316 return error(_("--all and --tags are incompatible"));
317 return error(_("--all can't be combined with refspecs"));
320 if ((flags
& TRANSPORT_PUSH_MIRROR
) && refspec
) {
321 if (!strcmp(*refspec
, "refs/tags/*"))
322 return error(_("--mirror and --tags are incompatible"));
323 return error(_("--mirror can't be combined with refspecs"));
326 if ((flags
& (TRANSPORT_PUSH_ALL
|TRANSPORT_PUSH_MIRROR
)) ==
327 (TRANSPORT_PUSH_ALL
|TRANSPORT_PUSH_MIRROR
)) {
328 return error(_("--all and --mirror are incompatible"));
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
))
336 setup_default_push_refspecs(remote
);
339 url_nr
= push_url_of_remote(remote
, &url
);
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
))
348 struct transport
*transport
=
349 transport_get(remote
, NULL
);
351 if (push_with_options(transport
, flags
))
357 static int option_parse_recurse_submodules(const struct option
*opt
,
358 const char *arg
, int unset
)
360 int *flags
= opt
->value
;
362 if (*flags
& (TRANSPORT_RECURSE_SUBMODULES_CHECK
|
363 TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND
))
364 die("%s can only be used once.", opt
->long_name
);
367 if (!strcmp(arg
, "check"))
368 *flags
|= TRANSPORT_RECURSE_SUBMODULES_CHECK
;
369 else if (!strcmp(arg
, "on-demand"))
370 *flags
|= TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND
;
372 die("bad %s argument: %s", opt
->long_name
, arg
);
374 die("option %s needs an argument (check|on-demand)",
380 int cmd_push(int argc
, const char **argv
, const char *prefix
)
385 const char *repo
= NULL
; /* default repository */
386 struct option options
[] = {
387 OPT__VERBOSITY(&verbosity
),
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"),
391 (TRANSPORT_PUSH_MIRROR
|TRANSPORT_PUSH_FORCE
)),
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"),
398 N_("control recursive pushing of submodules"),
399 PARSE_OPT_OPTARG
, option_parse_recurse_submodules
},
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"),
404 TRANSPORT_PUSH_SET_UPSTREAM
),
405 OPT_BOOL(0, "progress", &progress
, N_("force progress reporting")),
406 OPT_BIT(0, "prune", &flags
, N_("prune locally removed refs"),
407 TRANSPORT_PUSH_PRUNE
),
411 packet_trace_identity("push");
412 git_config(git_default_config
, NULL
);
413 argc
= parse_options(argc
, argv
, prefix
, options
, push_usage
, 0);
415 if (deleterefs
&& (tags
|| (flags
& (TRANSPORT_PUSH_ALL
| TRANSPORT_PUSH_MIRROR
))))
416 die(_("--delete is incompatible with --all, --mirror and --tags"));
417 if (deleterefs
&& argc
< 2)
418 die(_("--delete doesn't make sense without any refs"));
421 add_refspec("refs/tags/*");
425 set_refspecs(argv
+ 1, argc
- 1);
428 rc
= do_push(repo
, flags
);
430 usage_with_options(push_usage
, options
);