builtin/push.c

   1 /*
   2  * "git push"
   3  */
   4 #include "cache.h"
   5 #include "refs.h"
   6 #include "run-command.h"
   7 #include "builtin.h"
   8 #include "remote.h"
   9 #include "transport.h"
  10 #include "parse-options.h"
  11 #include "submodule.h"
  12
  13 static const char * const push_usage[] = {
  14         N_("git push [<options>] [<repository> [<refspec>...]]"),
  15         NULL,
  16 };
  17
  18 static int thin;
  19 static int deleterefs;
  20 static const char *receivepack;
  21 static int verbosity;
  22 static int progress = -1;
  23
  24 static const char **refspec;
  25 static int refspec_nr;
  26 static int refspec_alloc;
  27 static int default_matching_used;
  28
  29 static void add_refspec(const char *ref)
  30 {
  31         refspec_nr++;
  32         ALLOC_GROW(refspec, refspec_nr, refspec_alloc);
  33         refspec[refspec_nr-1] = ref;
  34 }
  35
  36 static void set_refspecs(const char **refs, int nr)
  37 {
  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)
  45                                 die(_("tag shorthand without <tag>"));
  46                         len = strlen(refs[i]) + 11;
  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                         }
  54                         strcat(tag, refs[i]);
  55                         ref = tag;
  56                 } else if (deleterefs && !strchr(ref, ':')) {
  57                         char *delref;
  58                         int len = strlen(ref)+1;
  59                         delref = xmalloc(len+1);
  60                         strcpy(delref, ":");
  61                         strcat(delref, ref);
  62                         ref = delref;
  63                 } else if (deleterefs)
  64                         die(_("--delete only accepts plain target ref names"));
  65                 add_refspec(ref);
  66         }
  67 }
  68
  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
  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)
 117 {
 118         struct strbuf refspec = STRBUF_INIT;
 119         struct branch *branch = branch_get(NULL);
 120         if (!branch)
 121                 die(_("You are not currently on a branch.\n"
 122                     "To push the history leading to the current (detached HEAD)\n"
 123                     "state now, use\n"
 124                     "\n"
 125                     "    git push %s HEAD:<name-of-remote-branch>\n"),
 126                     remote->name);
 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"
 130                     "\n"
 131                     "    git push --set-upstream %s %s\n"),
 132                     branch->name,
 133                     remote->name,
 134                     branch->name);
 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);
 145
 146         strbuf_addf(&refspec, "%s:%s", branch->name, branch->merge[0]->src);
 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(":");
 184                 break;
 185
 186         case PUSH_DEFAULT_SIMPLE:
 187                 setup_push_upstream(remote, 1);
 188                 break;
 189
 190         case PUSH_DEFAULT_UPSTREAM:
 191                 setup_push_upstream(remote, 0);
 192                 break;
 193
 194         case PUSH_DEFAULT_CURRENT:
 195                 add_refspec("HEAD");
 196                 break;
 197
 198         case PUSH_DEFAULT_NOTHING:
 199                 die(_("You didn't specify any refspecs to push, and "
 200                     "push.default is \"nothing\"."));
 201                 break;
 202         }
 203 }
 204
 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"
 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"
 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
 223 static const char message_advice_ref_fetch_first[] =
 224         N_("Updates were rejected because the remote contains work that you do\n"
 225            "not have locally. This is usually caused by another repository pushing\n"
 226            "to the same ref. You may want to first merge the remote changes (e.g.,\n"
 227            "'git pull') before pushing again.\n"
 228            "See the 'Note about fast-forwards' in 'git push --help' for details.");
 229
 230 static const char message_advice_ref_already_exists[] =
 231         N_("Updates were rejected because the destination reference already exists\n"
 232            "in the remote.");
 233
 234 static const char message_advice_ref_needs_force[] =
 235         N_("You cannot update a remote ref that points at a non-commit object,\n"
 236            "or update a remote ref to make it point at a non-commit object,\n"
 237            "without using the '--force' option.\n");
 238
 239 static void advise_pull_before_push(void)
 240 {
 241         if (!advice_push_non_ff_current || !advice_push_update_rejected)
 242                 return;
 243         advise(_(message_advice_pull_before_push));
 244 }
 245
 246 static void advise_use_upstream(void)
 247 {
 248         if (!advice_push_non_ff_default || !advice_push_update_rejected)
 249                 return;
 250         advise(_(message_advice_use_upstream));
 251 }
 252
 253 static void advise_checkout_pull_push(void)
 254 {
 255         if (!advice_push_non_ff_matching || !advice_push_update_rejected)
 256                 return;
 257         advise(_(message_advice_checkout_pull_push));
 258 }
 259
 260 static void advise_ref_already_exists(void)
 261 {
 262         if (!advice_push_already_exists || !advice_push_update_rejected)
 263                 return;
 264         advise(_(message_advice_ref_already_exists));
 265 }
 266
 267 static void advise_ref_fetch_first(void)
 268 {
 269         if (!advice_push_fetch_first || !advice_push_update_rejected)
 270                 return;
 271         advise(_(message_advice_ref_fetch_first));
 272 }
 273
 274 static void advise_ref_needs_force(void)
 275 {
 276         if (!advice_push_needs_force || !advice_push_update_rejected)
 277                 return;
 278         advise(_(message_advice_ref_needs_force));
 279 }
 280
 281 static int push_with_options(struct transport *transport, int flags)
 282 {
 283         int err;
 284         unsigned int reject_reasons;
 285
 286         transport_set_verbosity(transport, verbosity, progress);
 287
 288         if (receivepack)
 289                 transport_set_option(transport,
 290                                      TRANS_OPT_RECEIVEPACK, receivepack);
 291         if (thin)
 292                 transport_set_option(transport, TRANS_OPT_THIN, "yes");
 293
 294         if (verbosity > 0)
 295                 fprintf(stderr, _("Pushing to %s\n"), transport->url);
 296         err = transport_push(transport, refspec_nr, refspec, flags,
 297                              &reject_reasons);
 298         if (err != 0)
 299                 error(_("failed to push some refs to '%s'"), transport->url);
 300
 301         err |= transport_disconnect(transport);
 302         if (!err)
 303                 return 0;
 304
 305         if (reject_reasons & REJECT_NON_FF_HEAD) {
 306                 advise_pull_before_push();
 307         } else if (reject_reasons & REJECT_NON_FF_OTHER) {
 308                 if (default_matching_used)
 309                         advise_use_upstream();
 310                 else
 311                         advise_checkout_pull_push();
 312         } else if (reject_reasons & REJECT_ALREADY_EXISTS) {
 313                 advise_ref_already_exists();
 314         } else if (reject_reasons & REJECT_FETCH_FIRST) {
 315                 advise_ref_fetch_first();
 316         } else if (reject_reasons & REJECT_NEEDS_FORCE) {
 317                 advise_ref_needs_force();
 318         }
 319
 320         return 1;
 321 }
 322
 323 static int do_push(const char *repo, int flags)
 324 {
 325         int i, errs;
 326         struct remote *remote = remote_get(repo);
 327         const char **url;
 328         int url_nr;
 329
 330         if (!remote) {
 331                 if (repo)
 332                         die(_("bad repository '%s'"), repo);
 333                 die(_("No configured push destination.\n"
 334                     "Either specify the URL from the command-line or configure a remote repository using\n"
 335                     "\n"
 336                     "    git remote add <name> <url>\n"
 337                     "\n"
 338                     "and then push using the remote name\n"
 339                     "\n"
 340                     "    git push <name>\n"));
 341         }
 342
 343         if (remote->mirror)
 344                 flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
 345
 346         if ((flags & TRANSPORT_PUSH_ALL) && refspec) {
 347                 if (!strcmp(*refspec, "refs/tags/*"))
 348                         return error(_("--all and --tags are incompatible"));
 349                 return error(_("--all can't be combined with refspecs"));
 350         }
 351
 352         if ((flags & TRANSPORT_PUSH_MIRROR) && refspec) {
 353                 if (!strcmp(*refspec, "refs/tags/*"))
 354                         return error(_("--mirror and --tags are incompatible"));
 355                 return error(_("--mirror can't be combined with refspecs"));
 356         }
 357
 358         if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) ==
 359                                 (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) {
 360                 return error(_("--all and --mirror are incompatible"));
 361         }
 362
 363         if (!refspec && !(flags & TRANSPORT_PUSH_ALL)) {
 364                 if (remote->push_refspec_nr) {
 365                         refspec = remote->push_refspec;
 366                         refspec_nr = remote->push_refspec_nr;
 367                 } else if (!(flags & TRANSPORT_PUSH_MIRROR))
 368                         setup_default_push_refspecs(remote);
 369         }
 370         errs = 0;
 371         url_nr = push_url_of_remote(remote, &url);
 372         if (url_nr) {
 373                 for (i = 0; i < url_nr; i++) {
 374                         struct transport *transport =
 375                                 transport_get(remote, url[i]);
 376                         if (push_with_options(transport, flags))
 377                                 errs++;
 378                 }
 379         } else {
 380                 struct transport *transport =
 381                         transport_get(remote, NULL);
 382
 383                 if (push_with_options(transport, flags))
 384                         errs++;
 385         }
 386         return !!errs;
 387 }
 388
 389 static int option_parse_recurse_submodules(const struct option *opt,
 390                                    const char *arg, int unset)
 391 {
 392         int *flags = opt->value;
 393
 394         if (*flags & (TRANSPORT_RECURSE_SUBMODULES_CHECK |
 395                       TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND))
 396                 die("%s can only be used once.", opt->long_name);
 397
 398         if (arg) {
 399                 if (!strcmp(arg, "check"))
 400                         *flags |= TRANSPORT_RECURSE_SUBMODULES_CHECK;
 401                 else if (!strcmp(arg, "on-demand"))
 402                         *flags |= TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND;
 403                 else
 404                         die("bad %s argument: %s", opt->long_name, arg);
 405         } else
 406                 die("option %s needs an argument (check|on-demand)",
 407                                 opt->long_name);
 408
 409         return 0;
 410 }
 411
 412 int cmd_push(int argc, const char **argv, const char *prefix)
 413 {
 414         int flags = 0;
 415         int tags = 0;
 416         int rc;
 417         const char *repo = NULL;        /* default repository */
 418         struct option options[] = {
 419                 OPT__VERBOSITY(&verbosity),
 420                 OPT_STRING( 0 , "repo", &repo, N_("repository"), N_("repository")),
 421                 OPT_BIT( 0 , "all", &flags, N_("push all refs"), TRANSPORT_PUSH_ALL),
 422                 OPT_BIT( 0 , "mirror", &flags, N_("mirror all refs"),
 423                             (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)),
 424                 OPT_BOOLEAN( 0, "delete", &deleterefs, N_("delete refs")),
 425                 OPT_BOOLEAN( 0 , "tags", &tags, N_("push tags (can't be used with --all or --mirror)")),
 426                 OPT_BIT('n' , "dry-run", &flags, N_("dry run"), TRANSPORT_PUSH_DRY_RUN),
 427                 OPT_BIT( 0,  "porcelain", &flags, N_("machine-readable output"), TRANSPORT_PUSH_PORCELAIN),
 428                 OPT_BIT('f', "force", &flags, N_("force updates"), TRANSPORT_PUSH_FORCE),
 429                 { OPTION_CALLBACK, 0, "recurse-submodules", &flags, N_("check"),
 430                         N_("control recursive pushing of submodules"),
 431                         PARSE_OPT_OPTARG, option_parse_recurse_submodules },
 432                 OPT_BOOLEAN( 0 , "thin", &thin, N_("use thin pack")),
 433                 OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", N_("receive pack program")),
 434                 OPT_STRING( 0 , "exec", &receivepack, "receive-pack", N_("receive pack program")),
 435                 OPT_BIT('u', "set-upstream", &flags, N_("set upstream for git pull/status"),
 436                         TRANSPORT_PUSH_SET_UPSTREAM),
 437                 OPT_BOOL(0, "progress", &progress, N_("force progress reporting")),
 438                 OPT_BIT(0, "prune", &flags, N_("prune locally removed refs"),
 439                         TRANSPORT_PUSH_PRUNE),
 440                 OPT_END()
 441         };
 442
 443         packet_trace_identity("push");
 444         git_config(git_default_config, NULL);
 445         argc = parse_options(argc, argv, prefix, options, push_usage, 0);
 446
 447         if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR))))
 448                 die(_("--delete is incompatible with --all, --mirror and --tags"));
 449         if (deleterefs && argc < 2)
 450                 die(_("--delete doesn't make sense without any refs"));
 451
 452         if (tags)
 453                 add_refspec("refs/tags/*");
 454
 455         if (argc > 0) {
 456                 repo = argv[0];
 457                 set_refspecs(argv + 1, argc - 1);
 458         }
 459
 460         rc = do_push(repo, flags);
 461         if (rc == -1)
 462                 usage_with_options(push_usage, options);
 463         else
 464                 return rc;
 465 }