builtin/pull.c

   1 /*
   2  * Builtin "git pull"
   3  *
   4  * Based on git-pull.sh by Junio C Hamano
   5  *
   6  * Fetch one or more remote refs and merge it/them into the current HEAD.
   7  */
   8 #define USE_THE_INDEX_COMPATIBILITY_MACROS
   9 #include "cache.h"
  10 #include "config.h"
  11 #include "builtin.h"
  12 #include "parse-options.h"
  13 #include "exec-cmd.h"
  14 #include "run-command.h"
  15 #include "oid-array.h"
  16 #include "remote.h"
  17 #include "dir.h"
  18 #include "rebase.h"
  19 #include "refs.h"
  20 #include "refspec.h"
  21 #include "revision.h"
  22 #include "submodule.h"
  23 #include "submodule-config.h"
  24 #include "tempfile.h"
  25 #include "lockfile.h"
  26 #include "wt-status.h"
  27 #include "commit-reach.h"
  28 #include "sequencer.h"
  29
  30 /**
  31  * Parses the value of --rebase. If value is a false value, returns
  32  * REBASE_FALSE. If value is a true value, returns REBASE_TRUE. If value is
  33  * "merges", returns REBASE_MERGES. If value is "preserve", returns
  34  * REBASE_PRESERVE. If value is a invalid value, dies with a fatal error if
  35  * fatal is true, otherwise returns REBASE_INVALID.
  36  */
  37 static enum rebase_type parse_config_rebase(const char *key, const char *value,
  38                 int fatal)
  39 {
  40         enum rebase_type v = rebase_parse_value(value);
  41         if (v != REBASE_INVALID)
  42                 return v;
  43
  44         if (fatal)
  45                 die(_("Invalid value for %s: %s"), key, value);
  46         else
  47                 error(_("Invalid value for %s: %s"), key, value);
  48
  49         return REBASE_INVALID;
  50 }
  51
  52 /**
  53  * Callback for --rebase, which parses arg with parse_config_rebase().
  54  */
  55 static int parse_opt_rebase(const struct option *opt, const char *arg, int unset)
  56 {
  57         enum rebase_type *value = opt->value;
  58
  59         if (arg)
  60                 *value = parse_config_rebase("--rebase", arg, 0);
  61         else
  62                 *value = unset ? REBASE_FALSE : REBASE_TRUE;
  63         return *value == REBASE_INVALID ? -1 : 0;
  64 }
  65
  66 static const char * const pull_usage[] = {
  67         N_("git pull [<options>] [<repository> [<refspec>...]]"),
  68         NULL
  69 };
  70
  71 /* Shared options */
  72 static int opt_verbosity;
  73 static char *opt_progress;
  74 static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
  75
  76 /* Options passed to git-merge or git-rebase */
  77 static enum rebase_type opt_rebase = -1;
  78 static char *opt_diffstat;
  79 static char *opt_log;
  80 static char *opt_signoff;
  81 static char *opt_squash;
  82 static char *opt_commit;
  83 static char *opt_edit;
  84 static char *cleanup_arg;
  85 static char *opt_ff;
  86 static char *opt_verify_signatures;
  87 static int opt_autostash = -1;
  88 static int config_autostash;
  89 static int check_trust_level = 1;
  90 static struct strvec opt_strategies = STRVEC_INIT;
  91 static struct strvec opt_strategy_opts = STRVEC_INIT;
  92 static char *opt_gpg_sign;
  93 static int opt_allow_unrelated_histories;
  94
  95 /* Options passed to git-fetch */
  96 static char *opt_all;
  97 static char *opt_append;
  98 static char *opt_upload_pack;
  99 static int opt_force;
 100 static char *opt_tags;
 101 static char *opt_prune;
 102 static char *max_children;
 103 static int opt_dry_run;
 104 static char *opt_keep;
 105 static char *opt_depth;
 106 static char *opt_unshallow;
 107 static char *opt_update_shallow;
 108 static char *opt_refmap;
 109 static char *opt_ipv4;
 110 static char *opt_ipv6;
 111 static int opt_show_forced_updates = -1;
 112 static char *set_upstream;
 113 static struct strvec opt_fetch = STRVEC_INIT;
 114
 115 static struct option pull_options[] = {
 116         /* Shared options */
 117         OPT__VERBOSITY(&opt_verbosity),
 118         OPT_PASSTHRU(0, "progress", &opt_progress, NULL,
 119                 N_("force progress reporting"),
 120                 PARSE_OPT_NOARG),
 121         OPT_CALLBACK_F(0, "recurse-submodules",
 122                    &recurse_submodules, N_("on-demand"),
 123                    N_("control for recursive fetching of submodules"),
 124                    PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules),
 125
 126         /* Options passed to git-merge or git-rebase */
 127         OPT_GROUP(N_("Options related to merging")),
 128         OPT_CALLBACK_F('r', "rebase", &opt_rebase,
 129           "(false|true|merges|preserve|interactive)",
 130           N_("incorporate changes by rebasing rather than merging"),
 131           PARSE_OPT_OPTARG, parse_opt_rebase),
 132         OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,
 133                 N_("do not show a diffstat at the end of the merge"),
 134                 PARSE_OPT_NOARG | PARSE_OPT_NONEG),
 135         OPT_PASSTHRU(0, "stat", &opt_diffstat, NULL,
 136                 N_("show a diffstat at the end of the merge"),
 137                 PARSE_OPT_NOARG),
 138         OPT_PASSTHRU(0, "summary", &opt_diffstat, NULL,
 139                 N_("(synonym to --stat)"),
 140                 PARSE_OPT_NOARG | PARSE_OPT_HIDDEN),
 141         OPT_PASSTHRU(0, "log", &opt_log, N_("n"),
 142                 N_("add (at most <n>) entries from shortlog to merge commit message"),
 143                 PARSE_OPT_OPTARG),
 144         OPT_PASSTHRU(0, "signoff", &opt_signoff, NULL,
 145                 N_("add a Signed-off-by trailer"),
 146                 PARSE_OPT_OPTARG),
 147         OPT_PASSTHRU(0, "squash", &opt_squash, NULL,
 148                 N_("create a single commit instead of doing a merge"),
 149                 PARSE_OPT_NOARG),
 150         OPT_PASSTHRU(0, "commit", &opt_commit, NULL,
 151                 N_("perform a commit if the merge succeeds (default)"),
 152                 PARSE_OPT_NOARG),
 153         OPT_PASSTHRU(0, "edit", &opt_edit, NULL,
 154                 N_("edit message before committing"),
 155                 PARSE_OPT_NOARG),
 156         OPT_CLEANUP(&cleanup_arg),
 157         OPT_PASSTHRU(0, "ff", &opt_ff, NULL,
 158                 N_("allow fast-forward"),
 159                 PARSE_OPT_NOARG),
 160         OPT_PASSTHRU(0, "ff-only", &opt_ff, NULL,
 161                 N_("abort if fast-forward is not possible"),
 162                 PARSE_OPT_NOARG | PARSE_OPT_NONEG),
 163         OPT_PASSTHRU(0, "verify-signatures", &opt_verify_signatures, NULL,
 164                 N_("verify that the named commit has a valid GPG signature"),
 165                 PARSE_OPT_NOARG),
 166         OPT_BOOL(0, "autostash", &opt_autostash,
 167                 N_("automatically stash/stash pop before and after")),
 168         OPT_PASSTHRU_ARGV('s', "strategy", &opt_strategies, N_("strategy"),
 169                 N_("merge strategy to use"),
 170                 0),
 171         OPT_PASSTHRU_ARGV('X', "strategy-option", &opt_strategy_opts,
 172                 N_("option=value"),
 173                 N_("option for selected merge strategy"),
 174                 0),
 175         OPT_PASSTHRU('S', "gpg-sign", &opt_gpg_sign, N_("key-id"),
 176                 N_("GPG sign commit"),
 177                 PARSE_OPT_OPTARG),
 178         OPT_SET_INT(0, "allow-unrelated-histories",
 179                     &opt_allow_unrelated_histories,
 180                     N_("allow merging unrelated histories"), 1),
 181
 182         /* Options passed to git-fetch */
 183         OPT_GROUP(N_("Options related to fetching")),
 184         OPT_PASSTHRU(0, "all", &opt_all, NULL,
 185                 N_("fetch from all remotes"),
 186                 PARSE_OPT_NOARG),
 187         OPT_PASSTHRU('a', "append", &opt_append, NULL,
 188                 N_("append to .git/FETCH_HEAD instead of overwriting"),
 189                 PARSE_OPT_NOARG),
 190         OPT_PASSTHRU(0, "upload-pack", &opt_upload_pack, N_("path"),
 191                 N_("path to upload pack on remote end"),
 192                 0),
 193         OPT__FORCE(&opt_force, N_("force overwrite of local branch"), 0),
 194         OPT_PASSTHRU('t', "tags", &opt_tags, NULL,
 195                 N_("fetch all tags and associated objects"),
 196                 PARSE_OPT_NOARG),
 197         OPT_PASSTHRU('p', "prune", &opt_prune, NULL,
 198                 N_("prune remote-tracking branches no longer on remote"),
 199                 PARSE_OPT_NOARG),
 200         OPT_PASSTHRU('j', "jobs", &max_children, N_("n"),
 201                 N_("number of submodules pulled in parallel"),
 202                 PARSE_OPT_OPTARG),
 203         OPT_BOOL(0, "dry-run", &opt_dry_run,
 204                 N_("dry run")),
 205         OPT_PASSTHRU('k', "keep", &opt_keep, NULL,
 206                 N_("keep downloaded pack"),
 207                 PARSE_OPT_NOARG),
 208         OPT_PASSTHRU(0, "depth", &opt_depth, N_("depth"),
 209                 N_("deepen history of shallow clone"),
 210                 0),
 211         OPT_PASSTHRU_ARGV(0, "shallow-since", &opt_fetch, N_("time"),
 212                 N_("deepen history of shallow repository based on time"),
 213                 0),
 214         OPT_PASSTHRU_ARGV(0, "shallow-exclude", &opt_fetch, N_("revision"),
 215                 N_("deepen history of shallow clone, excluding rev"),
 216                 0),
 217         OPT_PASSTHRU_ARGV(0, "deepen", &opt_fetch, N_("n"),
 218                 N_("deepen history of shallow clone"),
 219                 0),
 220         OPT_PASSTHRU(0, "unshallow", &opt_unshallow, NULL,
 221                 N_("convert to a complete repository"),
 222                 PARSE_OPT_NONEG | PARSE_OPT_NOARG),
 223         OPT_PASSTHRU(0, "update-shallow", &opt_update_shallow, NULL,
 224                 N_("accept refs that update .git/shallow"),
 225                 PARSE_OPT_NOARG),
 226         OPT_PASSTHRU(0, "refmap", &opt_refmap, N_("refmap"),
 227                 N_("specify fetch refmap"),
 228                 PARSE_OPT_NONEG),
 229         OPT_PASSTHRU_ARGV('o', "server-option", &opt_fetch,
 230                 N_("server-specific"),
 231                 N_("option to transmit"),
 232                 0),
 233         OPT_PASSTHRU('4',  "ipv4", &opt_ipv4, NULL,
 234                 N_("use IPv4 addresses only"),
 235                 PARSE_OPT_NOARG),
 236         OPT_PASSTHRU('6',  "ipv6", &opt_ipv6, NULL,
 237                 N_("use IPv6 addresses only"),
 238                 PARSE_OPT_NOARG),
 239         OPT_PASSTHRU_ARGV(0, "negotiation-tip", &opt_fetch, N_("revision"),
 240                 N_("report that we have only objects reachable from this object"),
 241                 0),
 242         OPT_BOOL(0, "show-forced-updates", &opt_show_forced_updates,
 243                  N_("check for forced-updates on all updated branches")),
 244         OPT_PASSTHRU(0, "set-upstream", &set_upstream, NULL,
 245                 N_("set upstream for git pull/fetch"),
 246                 PARSE_OPT_NOARG),
 247
 248         OPT_END()
 249 };
 250
 251 /**
 252  * Pushes "-q" or "-v" switches into arr to match the opt_verbosity level.
 253  */
 254 static void argv_push_verbosity(struct strvec *arr)
 255 {
 256         int verbosity;
 257
 258         for (verbosity = opt_verbosity; verbosity > 0; verbosity--)
 259                 strvec_push(arr, "-v");
 260
 261         for (verbosity = opt_verbosity; verbosity < 0; verbosity++)
 262                 strvec_push(arr, "-q");
 263 }
 264
 265 /**
 266  * Pushes "-f" switches into arr to match the opt_force level.
 267  */
 268 static void argv_push_force(struct strvec *arr)
 269 {
 270         int force = opt_force;
 271         while (force-- > 0)
 272                 strvec_push(arr, "-f");
 273 }
 274
 275 /**
 276  * Sets the GIT_REFLOG_ACTION environment variable to the concatenation of argv
 277  */
 278 static void set_reflog_message(int argc, const char **argv)
 279 {
 280         int i;
 281         struct strbuf msg = STRBUF_INIT;
 282
 283         for (i = 0; i < argc; i++) {
 284                 if (i)
 285                         strbuf_addch(&msg, ' ');
 286                 strbuf_addstr(&msg, argv[i]);
 287         }
 288
 289         setenv("GIT_REFLOG_ACTION", msg.buf, 0);
 290
 291         strbuf_release(&msg);
 292 }
 293
 294 /**
 295  * If pull.ff is unset, returns NULL. If pull.ff is "true", returns "--ff". If
 296  * pull.ff is "false", returns "--no-ff". If pull.ff is "only", returns
 297  * "--ff-only". Otherwise, if pull.ff is set to an invalid value, die with an
 298  * error.
 299  */
 300 static const char *config_get_ff(void)
 301 {
 302         const char *value;
 303
 304         if (git_config_get_value("pull.ff", &value))
 305                 return NULL;
 306
 307         switch (git_parse_maybe_bool(value)) {
 308         case 0:
 309                 return "--no-ff";
 310         case 1:
 311                 return "--ff";
 312         }
 313
 314         if (!strcmp(value, "only"))
 315                 return "--ff-only";
 316
 317         die(_("Invalid value for pull.ff: %s"), value);
 318 }
 319
 320 /**
 321  * Returns the default configured value for --rebase. It first looks for the
 322  * value of "branch.$curr_branch.rebase", where $curr_branch is the current
 323  * branch, and if HEAD is detached or the configuration key does not exist,
 324  * looks for the value of "pull.rebase". If both configuration keys do not
 325  * exist, returns REBASE_FALSE.
 326  */
 327 static enum rebase_type config_get_rebase(void)
 328 {
 329         struct branch *curr_branch = branch_get("HEAD");
 330         const char *value;
 331
 332         if (curr_branch) {
 333                 char *key = xstrfmt("branch.%s.rebase", curr_branch->name);
 334
 335                 if (!git_config_get_value(key, &value)) {
 336                         enum rebase_type ret = parse_config_rebase(key, value, 1);
 337                         free(key);
 338                         return ret;
 339                 }
 340
 341                 free(key);
 342         }
 343
 344         if (!git_config_get_value("pull.rebase", &value))
 345                 return parse_config_rebase("pull.rebase", value, 1);
 346
 347         if (opt_verbosity >= 0 && !opt_ff) {
 348                 advise(_("Pulling without specifying how to reconcile divergent branches is\n"
 349                          "discouraged. You can squelch this message by running one of the following\n"
 350                          "commands sometime before your next pull:\n"
 351                          "\n"
 352                          "  git config pull.rebase false  # merge (the default strategy)\n"
 353                          "  git config pull.rebase true   # rebase\n"
 354                          "  git config pull.ff only       # fast-forward only\n"
 355                          "\n"
 356                          "You can replace \"git config\" with \"git config --global\" to set a default\n"
 357                          "preference for all repositories. You can also pass --rebase, --no-rebase,\n"
 358                          "or --ff-only on the command line to override the configured default per\n"
 359                          "invocation.\n"));
 360         }
 361
 362         return REBASE_FALSE;
 363 }
 364
 365 /**
 366  * Read config variables.
 367  */
 368 static int git_pull_config(const char *var, const char *value, void *cb)
 369 {
 370         int status;
 371
 372         if (!strcmp(var, "rebase.autostash")) {
 373                 config_autostash = git_config_bool(var, value);
 374                 return 0;
 375         } else if (!strcmp(var, "submodule.recurse")) {
 376                 recurse_submodules = git_config_bool(var, value) ?
 377                         RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
 378                 return 0;
 379         } else if (!strcmp(var, "gpg.mintrustlevel")) {
 380                 check_trust_level = 0;
 381         }
 382
 383         status = git_gpg_config(var, value, cb);
 384         if (status)
 385                 return status;
 386
 387         return git_default_config(var, value, cb);
 388 }
 389
 390 /**
 391  * Appends merge candidates from FETCH_HEAD that are not marked not-for-merge
 392  * into merge_heads.
 393  */
 394 static void get_merge_heads(struct oid_array *merge_heads)
 395 {
 396         const char *filename = git_path_fetch_head(the_repository);
 397         FILE *fp;
 398         struct strbuf sb = STRBUF_INIT;
 399         struct object_id oid;
 400
 401         fp = xfopen(filename, "r");
 402         while (strbuf_getline_lf(&sb, fp) != EOF) {
 403                 const char *p;
 404                 if (parse_oid_hex(sb.buf, &oid, &p))
 405                         continue;  /* invalid line: does not start with object ID */
 406                 if (starts_with(p, "\tnot-for-merge\t"))
 407                         continue;  /* ref is not-for-merge */
 408                 oid_array_append(merge_heads, &oid);
 409         }
 410         fclose(fp);
 411         strbuf_release(&sb);
 412 }
 413
 414 /**
 415  * Used by die_no_merge_candidates() as a for_each_remote() callback to
 416  * retrieve the name of the remote if the repository only has one remote.
 417  */
 418 static int get_only_remote(struct remote *remote, void *cb_data)
 419 {
 420         const char **remote_name = cb_data;
 421
 422         if (*remote_name)
 423                 return -1;
 424
 425         *remote_name = remote->name;
 426         return 0;
 427 }
 428
 429 /**
 430  * Dies with the appropriate reason for why there are no merge candidates:
 431  *
 432  * 1. We fetched from a specific remote, and a refspec was given, but it ended
 433  *    up not fetching anything. This is usually because the user provided a
 434  *    wildcard refspec which had no matches on the remote end.
 435  *
 436  * 2. We fetched from a non-default remote, but didn't specify a branch to
 437  *    merge. We can't use the configured one because it applies to the default
 438  *    remote, thus the user must specify the branches to merge.
 439  *
 440  * 3. We fetched from the branch's or repo's default remote, but:
 441  *
 442  *    a. We are not on a branch, so there will never be a configured branch to
 443  *       merge with.
 444  *
 445  *    b. We are on a branch, but there is no configured branch to merge with.
 446  *
 447  * 4. We fetched from the branch's or repo's default remote, but the configured
 448  *    branch to merge didn't get fetched. (Either it doesn't exist, or wasn't
 449  *    part of the configured fetch refspec.)
 450  */
 451 static void NORETURN die_no_merge_candidates(const char *repo, const char **refspecs)
 452 {
 453         struct branch *curr_branch = branch_get("HEAD");
 454         const char *remote = curr_branch ? curr_branch->remote_name : NULL;
 455
 456         if (*refspecs) {
 457                 if (opt_rebase)
 458                         fprintf_ln(stderr, _("There is no candidate for rebasing against among the refs that you just fetched."));
 459                 else
 460                         fprintf_ln(stderr, _("There are no candidates for merging among the refs that you just fetched."));
 461                 fprintf_ln(stderr, _("Generally this means that you provided a wildcard refspec which had no\n"
 462                                         "matches on the remote end."));
 463         } else if (repo && curr_branch && (!remote || strcmp(repo, remote))) {
 464                 fprintf_ln(stderr, _("You asked to pull from the remote '%s', but did not specify\n"
 465                         "a branch. Because this is not the default configured remote\n"
 466                         "for your current branch, you must specify a branch on the command line."),
 467                         repo);
 468         } else if (!curr_branch) {
 469                 fprintf_ln(stderr, _("You are not currently on a branch."));
 470                 if (opt_rebase)
 471                         fprintf_ln(stderr, _("Please specify which branch you want to rebase against."));
 472                 else
 473                         fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
 474                 fprintf_ln(stderr, _("See git-pull(1) for details."));
 475                 fprintf(stderr, "\n");
 476                 fprintf_ln(stderr, "    git pull %s %s", _("<remote>"), _("<branch>"));
 477                 fprintf(stderr, "\n");
 478         } else if (!curr_branch->merge_nr) {
 479                 const char *remote_name = NULL;
 480
 481                 if (for_each_remote(get_only_remote, &remote_name) || !remote_name)
 482                         remote_name = _("<remote>");
 483
 484                 fprintf_ln(stderr, _("There is no tracking information for the current branch."));
 485                 if (opt_rebase)
 486                         fprintf_ln(stderr, _("Please specify which branch you want to rebase against."));
 487                 else
 488                         fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
 489                 fprintf_ln(stderr, _("See git-pull(1) for details."));
 490                 fprintf(stderr, "\n");
 491                 fprintf_ln(stderr, "    git pull %s %s", _("<remote>"), _("<branch>"));
 492                 fprintf(stderr, "\n");
 493                 fprintf_ln(stderr, _("If you wish to set tracking information for this branch you can do so with:"));
 494                 fprintf(stderr, "\n");
 495                 fprintf_ln(stderr, "    git branch --set-upstream-to=%s/%s %s\n",
 496                                 remote_name, _("<branch>"), curr_branch->name);
 497         } else
 498                 fprintf_ln(stderr, _("Your configuration specifies to merge with the ref '%s'\n"
 499                         "from the remote, but no such ref was fetched."),
 500                         *curr_branch->merge_name);
 501         exit(1);
 502 }
 503
 504 /**
 505  * Parses argv into [<repo> [<refspecs>...]], returning their values in `repo`
 506  * as a string and `refspecs` as a null-terminated array of strings. If `repo`
 507  * is not provided in argv, it is set to NULL.
 508  */
 509 static void parse_repo_refspecs(int argc, const char **argv, const char **repo,
 510                 const char ***refspecs)
 511 {
 512         if (argc > 0) {
 513                 *repo = *argv++;
 514                 argc--;
 515         } else
 516                 *repo = NULL;
 517         *refspecs = argv;
 518 }
 519
 520 /**
 521  * Runs git-fetch, returning its exit status. `repo` and `refspecs` are the
 522  * repository and refspecs to fetch, or NULL if they are not provided.
 523  */
 524 static int run_fetch(const char *repo, const char **refspecs)
 525 {
 526         struct strvec args = STRVEC_INIT;
 527         int ret;
 528
 529         strvec_pushl(&args, "fetch", "--update-head-ok", NULL);
 530
 531         /* Shared options */
 532         argv_push_verbosity(&args);
 533         if (opt_progress)
 534                 strvec_push(&args, opt_progress);
 535
 536         /* Options passed to git-fetch */
 537         if (opt_all)
 538                 strvec_push(&args, opt_all);
 539         if (opt_append)
 540                 strvec_push(&args, opt_append);
 541         if (opt_upload_pack)
 542                 strvec_push(&args, opt_upload_pack);
 543         argv_push_force(&args);
 544         if (opt_tags)
 545                 strvec_push(&args, opt_tags);
 546         if (opt_prune)
 547                 strvec_push(&args, opt_prune);
 548         if (recurse_submodules != RECURSE_SUBMODULES_DEFAULT)
 549                 switch (recurse_submodules) {
 550                 case RECURSE_SUBMODULES_ON:
 551                         strvec_push(&args, "--recurse-submodules=on");
 552                         break;
 553                 case RECURSE_SUBMODULES_OFF:
 554                         strvec_push(&args, "--recurse-submodules=no");
 555                         break;
 556                 case RECURSE_SUBMODULES_ON_DEMAND:
 557                         strvec_push(&args, "--recurse-submodules=on-demand");
 558                         break;
 559                 default:
 560                         BUG("submodule recursion option not understood");
 561                 }
 562         if (max_children)
 563                 strvec_push(&args, max_children);
 564         if (opt_dry_run)
 565                 strvec_push(&args, "--dry-run");
 566         if (opt_keep)
 567                 strvec_push(&args, opt_keep);
 568         if (opt_depth)
 569                 strvec_push(&args, opt_depth);
 570         if (opt_unshallow)
 571                 strvec_push(&args, opt_unshallow);
 572         if (opt_update_shallow)
 573                 strvec_push(&args, opt_update_shallow);
 574         if (opt_refmap)
 575                 strvec_push(&args, opt_refmap);
 576         if (opt_ipv4)
 577                 strvec_push(&args, opt_ipv4);
 578         if (opt_ipv6)
 579                 strvec_push(&args, opt_ipv6);
 580         if (opt_show_forced_updates > 0)
 581                 strvec_push(&args, "--show-forced-updates");
 582         else if (opt_show_forced_updates == 0)
 583                 strvec_push(&args, "--no-show-forced-updates");
 584         if (set_upstream)
 585                 strvec_push(&args, set_upstream);
 586         strvec_pushv(&args, opt_fetch.v);
 587
 588         if (repo) {
 589                 strvec_push(&args, repo);
 590                 strvec_pushv(&args, refspecs);
 591         } else if (*refspecs)
 592                 BUG("refspecs without repo?");
 593         ret = run_command_v_opt(args.v, RUN_GIT_CMD);
 594         strvec_clear(&args);
 595         return ret;
 596 }
 597
 598 /**
 599  * "Pulls into void" by branching off merge_head.
 600  */
 601 static int pull_into_void(const struct object_id *merge_head,
 602                 const struct object_id *curr_head)
 603 {
 604         if (opt_verify_signatures) {
 605                 struct commit *commit;
 606
 607                 commit = lookup_commit(the_repository, merge_head);
 608                 if (!commit)
 609                         die(_("unable to access commit %s"),
 610                             oid_to_hex(merge_head));
 611
 612                 verify_merge_signature(commit, opt_verbosity,
 613                                        check_trust_level);
 614         }
 615
 616         /*
 617          * Two-way merge: we treat the index as based on an empty tree,
 618          * and try to fast-forward to HEAD. This ensures we will not lose
 619          * index/worktree changes that the user already made on the unborn
 620          * branch.
 621          */
 622         if (checkout_fast_forward(the_repository,
 623                                   the_hash_algo->empty_tree,
 624                                   merge_head, 0))
 625                 return 1;
 626
 627         if (update_ref("initial pull", "HEAD", merge_head, curr_head, 0, UPDATE_REFS_DIE_ON_ERR))
 628                 return 1;
 629
 630         return 0;
 631 }
 632
 633 static int rebase_submodules(void)
 634 {
 635         struct child_process cp = CHILD_PROCESS_INIT;
 636
 637         cp.git_cmd = 1;
 638         cp.no_stdin = 1;
 639         strvec_pushl(&cp.args, "submodule", "update",
 640                      "--recursive", "--rebase", NULL);
 641         argv_push_verbosity(&cp.args);
 642
 643         return run_command(&cp);
 644 }
 645
 646 static int update_submodules(void)
 647 {
 648         struct child_process cp = CHILD_PROCESS_INIT;
 649
 650         cp.git_cmd = 1;
 651         cp.no_stdin = 1;
 652         strvec_pushl(&cp.args, "submodule", "update",
 653                      "--recursive", "--checkout", NULL);
 654         argv_push_verbosity(&cp.args);
 655
 656         return run_command(&cp);
 657 }
 658
 659 /**
 660  * Runs git-merge, returning its exit status.
 661  */
 662 static int run_merge(void)
 663 {
 664         int ret;
 665         struct strvec args = STRVEC_INIT;
 666
 667         strvec_pushl(&args, "merge", NULL);
 668
 669         /* Shared options */
 670         argv_push_verbosity(&args);
 671         if (opt_progress)
 672                 strvec_push(&args, opt_progress);
 673
 674         /* Options passed to git-merge */
 675         if (opt_diffstat)
 676                 strvec_push(&args, opt_diffstat);
 677         if (opt_log)
 678                 strvec_push(&args, opt_log);
 679         if (opt_signoff)
 680                 strvec_push(&args, opt_signoff);
 681         if (opt_squash)
 682                 strvec_push(&args, opt_squash);
 683         if (opt_commit)
 684                 strvec_push(&args, opt_commit);
 685         if (opt_edit)
 686                 strvec_push(&args, opt_edit);
 687         if (cleanup_arg)
 688                 strvec_pushf(&args, "--cleanup=%s", cleanup_arg);
 689         if (opt_ff)
 690                 strvec_push(&args, opt_ff);
 691         if (opt_verify_signatures)
 692                 strvec_push(&args, opt_verify_signatures);
 693         strvec_pushv(&args, opt_strategies.v);
 694         strvec_pushv(&args, opt_strategy_opts.v);
 695         if (opt_gpg_sign)
 696                 strvec_push(&args, opt_gpg_sign);
 697         if (opt_autostash == 0)
 698                 strvec_push(&args, "--no-autostash");
 699         else if (opt_autostash == 1)
 700                 strvec_push(&args, "--autostash");
 701         if (opt_allow_unrelated_histories > 0)
 702                 strvec_push(&args, "--allow-unrelated-histories");
 703
 704         strvec_push(&args, "FETCH_HEAD");
 705         ret = run_command_v_opt(args.v, RUN_GIT_CMD);
 706         strvec_clear(&args);
 707         return ret;
 708 }
 709
 710 /**
 711  * Returns remote's upstream branch for the current branch. If remote is NULL,
 712  * the current branch's configured default remote is used. Returns NULL if
 713  * `remote` does not name a valid remote, HEAD does not point to a branch,
 714  * remote is not the branch's configured remote or the branch does not have any
 715  * configured upstream branch.
 716  */
 717 static const char *get_upstream_branch(const char *remote)
 718 {
 719         struct remote *rm;
 720         struct branch *curr_branch;
 721         const char *curr_branch_remote;
 722
 723         rm = remote_get(remote);
 724         if (!rm)
 725                 return NULL;
 726
 727         curr_branch = branch_get("HEAD");
 728         if (!curr_branch)
 729                 return NULL;
 730
 731         curr_branch_remote = remote_for_branch(curr_branch, NULL);
 732         assert(curr_branch_remote);
 733
 734         if (strcmp(curr_branch_remote, rm->name))
 735                 return NULL;
 736
 737         return branch_get_upstream(curr_branch, NULL);
 738 }
 739
 740 /**
 741  * Derives the remote-tracking branch from the remote and refspec.
 742  *
 743  * FIXME: The current implementation assumes the default mapping of
 744  * refs/heads/<branch_name> to refs/remotes/<remote_name>/<branch_name>.
 745  */
 746 static const char *get_tracking_branch(const char *remote, const char *refspec)
 747 {
 748         struct refspec_item spec;
 749         const char *spec_src;
 750         const char *merge_branch;
 751
 752         refspec_item_init_or_die(&spec, refspec, REFSPEC_FETCH);
 753         spec_src = spec.src;
 754         if (!*spec_src || !strcmp(spec_src, "HEAD"))
 755                 spec_src = "HEAD";
 756         else if (skip_prefix(spec_src, "heads/", &spec_src))
 757                 ;
 758         else if (skip_prefix(spec_src, "refs/heads/", &spec_src))
 759                 ;
 760         else if (starts_with(spec_src, "refs/") ||
 761                 starts_with(spec_src, "tags/") ||
 762                 starts_with(spec_src, "remotes/"))
 763                 spec_src = "";
 764
 765         if (*spec_src) {
 766                 if (!strcmp(remote, "."))
 767                         merge_branch = mkpath("refs/heads/%s", spec_src);
 768                 else
 769                         merge_branch = mkpath("refs/remotes/%s/%s", remote, spec_src);
 770         } else
 771                 merge_branch = NULL;
 772
 773         refspec_item_clear(&spec);
 774         return merge_branch;
 775 }
 776
 777 /**
 778  * Given the repo and refspecs, sets fork_point to the point at which the
 779  * current branch forked from its remote-tracking branch. Returns 0 on success,
 780  * -1 on failure.
 781  */
 782 static int get_rebase_fork_point(struct object_id *fork_point, const char *repo,
 783                 const char *refspec)
 784 {
 785         int ret;
 786         struct branch *curr_branch;
 787         const char *remote_branch;
 788         struct child_process cp = CHILD_PROCESS_INIT;
 789         struct strbuf sb = STRBUF_INIT;
 790
 791         curr_branch = branch_get("HEAD");
 792         if (!curr_branch)
 793                 return -1;
 794
 795         if (refspec)
 796                 remote_branch = get_tracking_branch(repo, refspec);
 797         else
 798                 remote_branch = get_upstream_branch(repo);
 799
 800         if (!remote_branch)
 801                 return -1;
 802
 803         strvec_pushl(&cp.args, "merge-base", "--fork-point",
 804                      remote_branch, curr_branch->name, NULL);
 805         cp.no_stdin = 1;
 806         cp.no_stderr = 1;
 807         cp.git_cmd = 1;
 808
 809         ret = capture_command(&cp, &sb, GIT_MAX_HEXSZ);
 810         if (ret)
 811                 goto cleanup;
 812
 813         ret = get_oid_hex(sb.buf, fork_point);
 814         if (ret)
 815                 goto cleanup;
 816
 817 cleanup:
 818         strbuf_release(&sb);
 819         return ret ? -1 : 0;
 820 }
 821
 822 /**
 823  * Sets merge_base to the octopus merge base of curr_head, merge_head and
 824  * fork_point. Returns 0 if a merge base is found, 1 otherwise.
 825  */
 826 static int get_octopus_merge_base(struct object_id *merge_base,
 827                 const struct object_id *curr_head,
 828                 const struct object_id *merge_head,
 829                 const struct object_id *fork_point)
 830 {
 831         struct commit_list *revs = NULL, *result;
 832
 833         commit_list_insert(lookup_commit_reference(the_repository, curr_head),
 834                            &revs);
 835         commit_list_insert(lookup_commit_reference(the_repository, merge_head),
 836                            &revs);
 837         if (!is_null_oid(fork_point))
 838                 commit_list_insert(lookup_commit_reference(the_repository, fork_point),
 839                                    &revs);
 840
 841         result = get_octopus_merge_bases(revs);
 842         free_commit_list(revs);
 843         reduce_heads_replace(&result);
 844
 845         if (!result)
 846                 return 1;
 847
 848         oidcpy(merge_base, &result->item->object.oid);
 849         free_commit_list(result);
 850         return 0;
 851 }
 852
 853 /**
 854  * Given the current HEAD oid, the merge head returned from git-fetch and the
 855  * fork point calculated by get_rebase_fork_point(), compute the <newbase> and
 856  * <upstream> arguments to use for the upcoming git-rebase invocation.
 857  */
 858 static int get_rebase_newbase_and_upstream(struct object_id *newbase,
 859                 struct object_id *upstream,
 860                 const struct object_id *curr_head,
 861                 const struct object_id *merge_head,
 862                 const struct object_id *fork_point)
 863 {
 864         struct object_id oct_merge_base;
 865
 866         if (!get_octopus_merge_base(&oct_merge_base, curr_head, merge_head, fork_point))
 867                 if (!is_null_oid(fork_point) && oideq(&oct_merge_base, fork_point))
 868                         fork_point = NULL;
 869
 870         if (fork_point && !is_null_oid(fork_point))
 871                 oidcpy(upstream, fork_point);
 872         else
 873                 oidcpy(upstream, merge_head);
 874
 875         oidcpy(newbase, merge_head);
 876
 877         return 0;
 878 }
 879
 880 /**
 881  * Given the <newbase> and <upstream> calculated by
 882  * get_rebase_newbase_and_upstream(), runs git-rebase with the
 883  * appropriate arguments and returns its exit status.
 884  */
 885 static int run_rebase(const struct object_id *newbase,
 886                 const struct object_id *upstream)
 887 {
 888         int ret;
 889         struct strvec args = STRVEC_INIT;
 890
 891         strvec_push(&args, "rebase");
 892
 893         /* Shared options */
 894         argv_push_verbosity(&args);
 895
 896         /* Options passed to git-rebase */
 897         if (opt_rebase == REBASE_MERGES)
 898                 strvec_push(&args, "--rebase-merges");
 899         else if (opt_rebase == REBASE_PRESERVE)
 900                 strvec_push(&args, "--preserve-merges");
 901         else if (opt_rebase == REBASE_INTERACTIVE)
 902                 strvec_push(&args, "--interactive");
 903         if (opt_diffstat)
 904                 strvec_push(&args, opt_diffstat);
 905         strvec_pushv(&args, opt_strategies.v);
 906         strvec_pushv(&args, opt_strategy_opts.v);
 907         if (opt_gpg_sign)
 908                 strvec_push(&args, opt_gpg_sign);
 909         if (opt_autostash == 0)
 910                 strvec_push(&args, "--no-autostash");
 911         else if (opt_autostash == 1)
 912                 strvec_push(&args, "--autostash");
 913         if (opt_verify_signatures &&
 914             !strcmp(opt_verify_signatures, "--verify-signatures"))
 915                 warning(_("ignoring --verify-signatures for rebase"));
 916
 917         strvec_push(&args, "--onto");
 918         strvec_push(&args, oid_to_hex(newbase));
 919
 920         strvec_push(&args, oid_to_hex(upstream));
 921
 922         ret = run_command_v_opt(args.v, RUN_GIT_CMD);
 923         strvec_clear(&args);
 924         return ret;
 925 }
 926
 927 int cmd_pull(int argc, const char **argv, const char *prefix)
 928 {
 929         const char *repo, **refspecs;
 930         struct oid_array merge_heads = OID_ARRAY_INIT;
 931         struct object_id orig_head, curr_head;
 932         struct object_id rebase_fork_point;
 933         int autostash;
 934
 935         if (!getenv("GIT_REFLOG_ACTION"))
 936                 set_reflog_message(argc, argv);
 937
 938         git_config(git_pull_config, NULL);
 939
 940         argc = parse_options(argc, argv, prefix, pull_options, pull_usage, 0);
 941
 942         if (cleanup_arg)
 943                 /*
 944                  * this only checks the validity of cleanup_arg; we don't need
 945                  * a valid value for use_editor
 946                  */
 947                 get_cleanup_mode(cleanup_arg, 0);
 948
 949         parse_repo_refspecs(argc, argv, &repo, &refspecs);
 950
 951         if (!opt_ff)
 952                 opt_ff = xstrdup_or_null(config_get_ff());
 953
 954         if (opt_rebase < 0)
 955                 opt_rebase = config_get_rebase();
 956
 957         if (read_cache_unmerged())
 958                 die_resolve_conflict("pull");
 959
 960         if (file_exists(git_path_merge_head(the_repository)))
 961                 die_conclude_merge();
 962
 963         if (get_oid("HEAD", &orig_head))
 964                 oidclr(&orig_head);
 965
 966         autostash = config_autostash;
 967         if (opt_rebase) {
 968                 if (opt_autostash != -1)
 969                         autostash = opt_autostash;
 970
 971                 if (is_null_oid(&orig_head) && !is_cache_unborn())
 972                         die(_("Updating an unborn branch with changes added to the index."));
 973
 974                 if (!autostash)
 975                         require_clean_work_tree(the_repository,
 976                                 N_("pull with rebase"),
 977                                 _("please commit or stash them."), 1, 0);
 978
 979                 if (get_rebase_fork_point(&rebase_fork_point, repo, *refspecs))
 980                         oidclr(&rebase_fork_point);
 981         }
 982
 983         if (run_fetch(repo, refspecs))
 984                 return 1;
 985
 986         if (opt_dry_run)
 987                 return 0;
 988
 989         if (get_oid("HEAD", &curr_head))
 990                 oidclr(&curr_head);
 991
 992         if (!is_null_oid(&orig_head) && !is_null_oid(&curr_head) &&
 993                         !oideq(&orig_head, &curr_head)) {
 994                 /*
 995                  * The fetch involved updating the current branch.
 996                  *
 997                  * The working tree and the index file are still based on
 998                  * orig_head commit, but we are merging into curr_head.
 999                  * Update the working tree to match curr_head.
1000                  */
1001
1002                 warning(_("fetch updated the current branch head.\n"
1003                         "fast-forwarding your working tree from\n"
1004                         "commit %s."), oid_to_hex(&orig_head));
1005
1006                 if (checkout_fast_forward(the_repository, &orig_head,
1007                                           &curr_head, 0))
1008                         die(_("Cannot fast-forward your working tree.\n"
1009                                 "After making sure that you saved anything precious from\n"
1010                                 "$ git diff %s\n"
1011                                 "output, run\n"
1012                                 "$ git reset --hard\n"
1013                                 "to recover."), oid_to_hex(&orig_head));
1014         }
1015
1016         get_merge_heads(&merge_heads);
1017
1018         if (!merge_heads.nr)
1019                 die_no_merge_candidates(repo, refspecs);
1020
1021         if (is_null_oid(&orig_head)) {
1022                 if (merge_heads.nr > 1)
1023                         die(_("Cannot merge multiple branches into empty head."));
1024                 return pull_into_void(merge_heads.oid, &curr_head);
1025         }
1026         if (opt_rebase && merge_heads.nr > 1)
1027                 die(_("Cannot rebase onto multiple branches."));
1028
1029         if (opt_rebase) {
1030                 int ret = 0;
1031                 int ran_ff = 0;
1032
1033                 struct object_id newbase;
1034                 struct object_id upstream;
1035                 get_rebase_newbase_and_upstream(&newbase, &upstream, &curr_head,
1036                                                 merge_heads.oid, &rebase_fork_point);
1037
1038                 if ((recurse_submodules == RECURSE_SUBMODULES_ON ||
1039                      recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) &&
1040                     submodule_touches_in_range(the_repository, &upstream, &curr_head))
1041                         die(_("cannot rebase with locally recorded submodule modifications"));
1042                 if (!autostash) {
1043                         struct commit_list *list = NULL;
1044                         struct commit *merge_head, *head;
1045
1046                         head = lookup_commit_reference(the_repository,
1047                                                        &orig_head);
1048                         commit_list_insert(head, &list);
1049                         merge_head = lookup_commit_reference(the_repository,
1050                                                              &merge_heads.oid[0]);
1051                         if (repo_is_descendant_of(the_repository,
1052                                                   merge_head, list)) {
1053                                 /* we can fast-forward this without invoking rebase */
1054                                 opt_ff = "--ff-only";
1055                                 ran_ff = 1;
1056                                 ret = run_merge();
1057                         }
1058                         free_commit_list(list);
1059                 }
1060                 if (!ran_ff)
1061                         ret = run_rebase(&newbase, &upstream);
1062
1063                 if (!ret && (recurse_submodules == RECURSE_SUBMODULES_ON ||
1064                              recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND))
1065                         ret = rebase_submodules();
1066
1067                 return ret;
1068         } else {
1069                 int ret = run_merge();
1070                 if (!ret && (recurse_submodules == RECURSE_SUBMODULES_ON ||
1071                              recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND))
1072                         ret = update_submodules();
1073                 return ret;
1074         }
1075 }