git.oblomov.eu Git - git/blob - 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_already_exists[] =
 224         N_("Updates were rejected because the destination reference already exists\n"
 225            "in the remote.");
 226
 227 static void advise_pull_before_push(void)
 228 {
 229         if (!advice_push_non_ff_current || !advice_push_update_rejected)
 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_update_rejected)
 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_update_rejected)
 244                 return;
 245         advise(_(message_advice_checkout_pull_push));
 246 }
 247
 248 static void advise_ref_already_exists(void)
 249 {
 250         if (!advice_push_already_exists || !advice_push_update_rejected)
 251                 return;
 252         advise(_(message_advice_ref_already_exists));
 253 }
 254
 255 static int push_with_options(struct transport *transport, int flags)
 256 {
 257         int err;
 258         unsigned int reject_reasons;
 259
 260         transport_set_verbosity(transport, verbosity, progress);
 261
 262         if (receivepack)
 263                 transport_set_option(transport,
 264                                      TRANS_OPT_RECEIVEPACK, receivepack);
 265         if (thin)
 266                 transport_set_option(transport, TRANS_OPT_THIN, "yes");
 267
 268         if (verbosity > 0)
 269                 fprintf(stderr, _("Pushing to %s\n"), transport->url);
 270         err = transport_push(transport, refspec_nr, refspec, flags,
 271                              &reject_reasons);
 272         if (err != 0)
 273                 error(_("failed to push some refs to '%s'"), transport->url);
 274
 275         err |= transport_disconnect(transport);
 276         if (!err)
 277                 return 0;
 278
 279         if (reject_reasons & REJECT_NON_FF_HEAD) {
 280                 advise_pull_before_push();
 281         } else if (reject_reasons & REJECT_NON_FF_OTHER) {
 282                 if (default_matching_used)
 283                         advise_use_upstream();
 284                 else
 285                         advise_checkout_pull_push();
 286         } else if (reject_reasons & REJECT_ALREADY_EXISTS) {
 287                 advise_ref_already_exists();
 288         }
 289
 290         return 1;
 291 }
 292
 293 static int do_push(const char *repo, int flags)
 294 {
 295         int i, errs;
 296         struct remote *remote = remote_get(repo);
 297         const char **url;
 298         int url_nr;
 299
 300         if (!remote) {
 301                 if (repo)
 302                         die(_("bad repository '%s'"), repo);
 303                 die(_("No configured push destination.\n"
 304                     "Either specify the URL from the command-line or configure a remote repository using\n"
 305                     "\n"
 306                     "    git remote add <name> <url>\n"
 307                     "\n"
 308                     "and then push using the remote name\n"
 309                     "\n"
 310                     "    git push <name>\n"));
 311         }
 312
 313         if (remote->mirror)
 314                 flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
 315
 316         if ((flags & TRANSPORT_PUSH_ALL) && refspec) {
 317                 if (!strcmp(*refspec, "refs/tags/*"))
 318                         return error(_("--all and --tags are incompatible"));
 319                 return error(_("--all can't be combined with refspecs"));
 320         }
 321
 322         if ((flags & TRANSPORT_PUSH_MIRROR) && refspec) {
 323                 if (!strcmp(*refspec, "refs/tags/*"))
 324                         return error(_("--mirror and --tags are incompatible"));
 325                 return error(_("--mirror can't be combined with refspecs"));
 326         }
 327
 328         if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) ==
 329                                 (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) {
 330                 return error(_("--all and --mirror are incompatible"));
 331         }
 332
 333         if (!refspec && !(flags & TRANSPORT_PUSH_ALL)) {
 334                 if (remote->push_refspec_nr) {
 335                         refspec = remote->push_refspec;
 336                         refspec_nr = remote->push_refspec_nr;
 337                 } else if (!(flags & TRANSPORT_PUSH_MIRROR))
 338                         setup_default_push_refspecs(remote);
 339         }
 340         errs = 0;
 341         url_nr = push_url_of_remote(remote, &url);
 342         if (url_nr) {
 343                 for (i = 0; i < url_nr; i++) {
 344                         struct transport *transport =
 345                                 transport_get(remote, url[i]);
 346                         if (push_with_options(transport, flags))
 347                                 errs++;
 348                 }
 349         } else {
 350                 struct transport *transport =
 351                         transport_get(remote, NULL);
 352
 353                 if (push_with_options(transport, flags))
 354                         errs++;
 355         }
 356         return !!errs;
 357 }
 358
 359 static int option_parse_recurse_submodules(const struct option *opt,
 360                                    const char *arg, int unset)
 361 {
 362         int *flags = opt->value;
 363
 364         if (*flags & (TRANSPORT_RECURSE_SUBMODULES_CHECK |
 365                       TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND))
 366                 die("%s can only be used once.", opt->long_name);
 367
 368         if (arg) {
 369                 if (!strcmp(arg, "check"))
 370                         *flags |= TRANSPORT_RECURSE_SUBMODULES_CHECK;
 371                 else if (!strcmp(arg, "on-demand"))
 372                         *flags |= TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND;
 373                 else
 374                         die("bad %s argument: %s", opt->long_name, arg);
 375         } else
 376                 die("option %s needs an argument (check|on-demand)",
 377                                 opt->long_name);
 378
 379         return 0;
 380 }
 381
 382 int cmd_push(int argc, const char **argv, const char *prefix)
 383 {
 384         int flags = 0;
 385         int tags = 0;
 386         int rc;
 387         const char *repo = NULL;        /* default repository */
 388         struct option options[] = {
 389                 OPT__VERBOSITY(&verbosity),
 390                 OPT_STRING( 0 , "repo", &repo, N_("repository"), N_("repository")),
 391                 OPT_BIT( 0 , "all", &flags, N_("push all refs"), TRANSPORT_PUSH_ALL),
 392                 OPT_BIT( 0 , "mirror", &flags, N_("mirror all refs"),
 393                             (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)),
 394                 OPT_BOOLEAN( 0, "delete", &deleterefs, N_("delete refs")),
 395                 OPT_BOOLEAN( 0 , "tags", &tags, N_("push tags (can't be used with --all or --mirror)")),
 396                 OPT_BIT('n' , "dry-run", &flags, N_("dry run"), TRANSPORT_PUSH_DRY_RUN),
 397                 OPT_BIT( 0,  "porcelain", &flags, N_("machine-readable output"), TRANSPORT_PUSH_PORCELAIN),
 398                 OPT_BIT('f', "force", &flags, N_("force updates"), TRANSPORT_PUSH_FORCE),
 399                 { OPTION_CALLBACK, 0, "recurse-submodules", &flags, N_("check"),
 400                         N_("control recursive pushing of submodules"),
 401                         PARSE_OPT_OPTARG, option_parse_recurse_submodules },
 402                 OPT_BOOLEAN( 0 , "thin", &thin, N_("use thin pack")),
 403                 OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", N_("receive pack program")),
 404                 OPT_STRING( 0 , "exec", &receivepack, "receive-pack", N_("receive pack program")),
 405                 OPT_BIT('u', "set-upstream", &flags, N_("set upstream for git pull/status"),
 406                         TRANSPORT_PUSH_SET_UPSTREAM),
 407                 OPT_BOOL(0, "progress", &progress, N_("force progress reporting")),
 408                 OPT_BIT(0, "prune", &flags, N_("prune locally removed refs"),
 409                         TRANSPORT_PUSH_PRUNE),
 410                 OPT_END()
 411         };
 412
 413         packet_trace_identity("push");
 414         git_config(git_default_config, NULL);
 415         argc = parse_options(argc, argv, prefix, options, push_usage, 0);
 416
 417         if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR))))
 418                 die(_("--delete is incompatible with --all, --mirror and --tags"));
 419         if (deleterefs && argc < 2)
 420                 die(_("--delete doesn't make sense without any refs"));
 421
 422         if (tags)
 423                 add_refspec("refs/tags/*");
 424
 425         if (argc > 0) {
 426                 repo = argv[0];
 427                 set_refspecs(argv + 1, argc - 1);
 428         }
 429
 430         rc = do_push(repo, flags);
 431         if (rc == -1)
 432                 usage_with_options(push_usage, options);
 433         else
 434                 return rc;
 435 }