4 * Based on git-pull.sh by Junio C Hamano
6 * Fetch one or more remote refs and merge it/them into the current HEAD.
11 #include "parse-options.h"
13 #include "run-command.h"
14 #include "sha1-array.h"
19 #include "submodule.h"
20 #include "submodule-config.h"
23 #include "wt-status.h"
34 * Parses the value of --rebase. If value is a false value, returns
35 * REBASE_FALSE. If value is a true value, returns REBASE_TRUE. If value is
36 * "preserve", returns REBASE_PRESERVE. If value is a invalid value, dies with
37 * a fatal error if fatal is true, otherwise returns REBASE_INVALID.
39 static enum rebase_type parse_config_rebase(const char *key, const char *value,
42 int v = git_parse_maybe_bool(value);
48 else if (!strcmp(value, "preserve"))
49 return REBASE_PRESERVE;
50 else if (!strcmp(value, "interactive"))
51 return REBASE_INTERACTIVE;
54 die(_("Invalid value for %s: %s"), key, value);
56 error(_("Invalid value for %s: %s"), key, value);
58 return REBASE_INVALID;
62 * Callback for --rebase, which parses arg with parse_config_rebase().
64 static int parse_opt_rebase(const struct option *opt, const char *arg, int unset)
66 enum rebase_type *value = opt->value;
69 *value = parse_config_rebase("--rebase", arg, 0);
71 *value = unset ? REBASE_FALSE : REBASE_TRUE;
72 return *value == REBASE_INVALID ? -1 : 0;
75 static const char * const pull_usage[] = {
76 N_("git pull [<options>] [<repository> [<refspec>...]]"),
81 static int opt_verbosity;
82 static char *opt_progress;
83 static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
85 /* Options passed to git-merge or git-rebase */
86 static enum rebase_type opt_rebase = -1;
87 static char *opt_diffstat;
89 static char *opt_squash;
90 static char *opt_commit;
91 static char *opt_edit;
93 static char *opt_verify_signatures;
94 static int opt_autostash = -1;
95 static int config_autostash;
96 static struct argv_array opt_strategies = ARGV_ARRAY_INIT;
97 static struct argv_array opt_strategy_opts = ARGV_ARRAY_INIT;
98 static char *opt_gpg_sign;
99 static int opt_allow_unrelated_histories;
101 /* Options passed to git-fetch */
102 static char *opt_all;
103 static char *opt_append;
104 static char *opt_upload_pack;
105 static int opt_force;
106 static char *opt_tags;
107 static char *opt_prune;
108 static char *max_children;
109 static int opt_dry_run;
110 static char *opt_keep;
111 static char *opt_depth;
112 static char *opt_unshallow;
113 static char *opt_update_shallow;
114 static char *opt_refmap;
115 static char *opt_ipv4;
116 static char *opt_ipv6;
118 static struct option pull_options[] = {
120 OPT__VERBOSITY(&opt_verbosity),
121 OPT_PASSTHRU(0, "progress", &opt_progress, NULL,
122 N_("force progress reporting"),
124 { OPTION_CALLBACK, 0, "recurse-submodules",
125 &recurse_submodules, N_("on-demand"),
126 N_("control for recursive fetching of submodules"),
127 PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules },
129 /* Options passed to git-merge or git-rebase */
130 OPT_GROUP(N_("Options related to merging")),
131 { OPTION_CALLBACK, 'r', "rebase", &opt_rebase,
132 "false|true|preserve|interactive",
133 N_("incorporate changes by rebasing rather than merging"),
134 PARSE_OPT_OPTARG, parse_opt_rebase },
135 OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,
136 N_("do not show a diffstat at the end of the merge"),
137 PARSE_OPT_NOARG | PARSE_OPT_NONEG),
138 OPT_PASSTHRU(0, "stat", &opt_diffstat, NULL,
139 N_("show a diffstat at the end of the merge"),
141 OPT_PASSTHRU(0, "summary", &opt_diffstat, NULL,
142 N_("(synonym to --stat)"),
143 PARSE_OPT_NOARG | PARSE_OPT_HIDDEN),
144 OPT_PASSTHRU(0, "log", &opt_log, N_("n"),
145 N_("add (at most <n>) entries from shortlog to merge commit message"),
147 OPT_PASSTHRU(0, "squash", &opt_squash, NULL,
148 N_("create a single commit instead of doing a merge"),
150 OPT_PASSTHRU(0, "commit", &opt_commit, NULL,
151 N_("perform a commit if the merge succeeds (default)"),
153 OPT_PASSTHRU(0, "edit", &opt_edit, NULL,
154 N_("edit message before committing"),
156 OPT_PASSTHRU(0, "ff", &opt_ff, NULL,
157 N_("allow fast-forward"),
159 OPT_PASSTHRU(0, "ff-only", &opt_ff, NULL,
160 N_("abort if fast-forward is not possible"),
161 PARSE_OPT_NOARG | PARSE_OPT_NONEG),
162 OPT_PASSTHRU(0, "verify-signatures", &opt_verify_signatures, NULL,
163 N_("verify that the named commit has a valid GPG signature"),
165 OPT_BOOL(0, "autostash", &opt_autostash,
166 N_("automatically stash/stash pop before and after rebase")),
167 OPT_PASSTHRU_ARGV('s', "strategy", &opt_strategies, N_("strategy"),
168 N_("merge strategy to use"),
170 OPT_PASSTHRU_ARGV('X', "strategy-option", &opt_strategy_opts,
172 N_("option for selected merge strategy"),
174 OPT_PASSTHRU('S', "gpg-sign", &opt_gpg_sign, N_("key-id"),
175 N_("GPG sign commit"),
177 OPT_SET_INT(0, "allow-unrelated-histories",
178 &opt_allow_unrelated_histories,
179 N_("allow merging unrelated histories"), 1),
181 /* Options passed to git-fetch */
182 OPT_GROUP(N_("Options related to fetching")),
183 OPT_PASSTHRU(0, "all", &opt_all, NULL,
184 N_("fetch from all remotes"),
186 OPT_PASSTHRU('a', "append", &opt_append, NULL,
187 N_("append to .git/FETCH_HEAD instead of overwriting"),
189 OPT_PASSTHRU(0, "upload-pack", &opt_upload_pack, N_("path"),
190 N_("path to upload pack on remote end"),
192 OPT__FORCE(&opt_force, N_("force overwrite of local branch")),
193 OPT_PASSTHRU('t', "tags", &opt_tags, NULL,
194 N_("fetch all tags and associated objects"),
196 OPT_PASSTHRU('p', "prune", &opt_prune, NULL,
197 N_("prune remote-tracking branches no longer on remote"),
199 OPT_PASSTHRU('j', "jobs", &max_children, N_("n"),
200 N_("number of submodules pulled in parallel"),
202 OPT_BOOL(0, "dry-run", &opt_dry_run,
204 OPT_PASSTHRU('k', "keep", &opt_keep, NULL,
205 N_("keep downloaded pack"),
207 OPT_PASSTHRU(0, "depth", &opt_depth, N_("depth"),
208 N_("deepen history of shallow clone"),
210 OPT_PASSTHRU(0, "unshallow", &opt_unshallow, NULL,
211 N_("convert to a complete repository"),
212 PARSE_OPT_NONEG | PARSE_OPT_NOARG),
213 OPT_PASSTHRU(0, "update-shallow", &opt_update_shallow, NULL,
214 N_("accept refs that update .git/shallow"),
216 OPT_PASSTHRU(0, "refmap", &opt_refmap, N_("refmap"),
217 N_("specify fetch refmap"),
219 OPT_PASSTHRU('4', "ipv4", &opt_ipv4, NULL,
220 N_("use IPv4 addresses only"),
222 OPT_PASSTHRU('6', "ipv6", &opt_ipv6, NULL,
223 N_("use IPv6 addresses only"),
230 * Pushes "-q" or "-v" switches into arr to match the opt_verbosity level.
232 static void argv_push_verbosity(struct argv_array *arr)
236 for (verbosity = opt_verbosity; verbosity > 0; verbosity--)
237 argv_array_push(arr, "-v");
239 for (verbosity = opt_verbosity; verbosity < 0; verbosity++)
240 argv_array_push(arr, "-q");
244 * Pushes "-f" switches into arr to match the opt_force level.
246 static void argv_push_force(struct argv_array *arr)
248 int force = opt_force;
250 argv_array_push(arr, "-f");
254 * Sets the GIT_REFLOG_ACTION environment variable to the concatenation of argv
256 static void set_reflog_message(int argc, const char **argv)
259 struct strbuf msg = STRBUF_INIT;
261 for (i = 0; i < argc; i++) {
263 strbuf_addch(&msg, ' ');
264 strbuf_addstr(&msg, argv[i]);
267 setenv("GIT_REFLOG_ACTION", msg.buf, 0);
269 strbuf_release(&msg);
273 * If pull.ff is unset, returns NULL. If pull.ff is "true", returns "--ff". If
274 * pull.ff is "false", returns "--no-ff". If pull.ff is "only", returns
275 * "--ff-only". Otherwise, if pull.ff is set to an invalid value, die with an
278 static const char *config_get_ff(void)
282 if (git_config_get_value("pull.ff", &value))
285 switch (git_parse_maybe_bool(value)) {
292 if (!strcmp(value, "only"))
295 die(_("Invalid value for pull.ff: %s"), value);
299 * Returns the default configured value for --rebase. It first looks for the
300 * value of "branch.$curr_branch.rebase", where $curr_branch is the current
301 * branch, and if HEAD is detached or the configuration key does not exist,
302 * looks for the value of "pull.rebase". If both configuration keys do not
303 * exist, returns REBASE_FALSE.
305 static enum rebase_type config_get_rebase(void)
307 struct branch *curr_branch = branch_get("HEAD");
311 char *key = xstrfmt("branch.%s.rebase", curr_branch->name);
313 if (!git_config_get_value(key, &value)) {
314 enum rebase_type ret = parse_config_rebase(key, value, 1);
322 if (!git_config_get_value("pull.rebase", &value))
323 return parse_config_rebase("pull.rebase", value, 1);
329 * Read config variables.
331 static int git_pull_config(const char *var, const char *value, void *cb)
333 if (!strcmp(var, "rebase.autostash")) {
334 config_autostash = git_config_bool(var, value);
336 } else if (!strcmp(var, "submodule.recurse")) {
337 recurse_submodules = git_config_bool(var, value) ?
338 RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
341 return git_default_config(var, value, cb);
345 * Appends merge candidates from FETCH_HEAD that are not marked not-for-merge
348 static void get_merge_heads(struct oid_array *merge_heads)
350 const char *filename = git_path_fetch_head();
352 struct strbuf sb = STRBUF_INIT;
353 struct object_id oid;
355 fp = xfopen(filename, "r");
356 while (strbuf_getline_lf(&sb, fp) != EOF) {
357 if (get_oid_hex(sb.buf, &oid))
358 continue; /* invalid line: does not start with SHA1 */
359 if (starts_with(sb.buf + GIT_SHA1_HEXSZ, "\tnot-for-merge\t"))
360 continue; /* ref is not-for-merge */
361 oid_array_append(merge_heads, &oid);
368 * Used by die_no_merge_candidates() as a for_each_remote() callback to
369 * retrieve the name of the remote if the repository only has one remote.
371 static int get_only_remote(struct remote *remote, void *cb_data)
373 const char **remote_name = cb_data;
378 *remote_name = remote->name;
383 * Dies with the appropriate reason for why there are no merge candidates:
385 * 1. We fetched from a specific remote, and a refspec was given, but it ended
386 * up not fetching anything. This is usually because the user provided a
387 * wildcard refspec which had no matches on the remote end.
389 * 2. We fetched from a non-default remote, but didn't specify a branch to
390 * merge. We can't use the configured one because it applies to the default
391 * remote, thus the user must specify the branches to merge.
393 * 3. We fetched from the branch's or repo's default remote, but:
395 * a. We are not on a branch, so there will never be a configured branch to
398 * b. We are on a branch, but there is no configured branch to merge with.
400 * 4. We fetched from the branch's or repo's default remote, but the configured
401 * branch to merge didn't get fetched. (Either it doesn't exist, or wasn't
402 * part of the configured fetch refspec.)
404 static void NORETURN die_no_merge_candidates(const char *repo, const char **refspecs)
406 struct branch *curr_branch = branch_get("HEAD");
407 const char *remote = curr_branch ? curr_branch->remote_name : NULL;
411 fprintf_ln(stderr, _("There is no candidate for rebasing against among the refs that you just fetched."));
413 fprintf_ln(stderr, _("There are no candidates for merging among the refs that you just fetched."));
414 fprintf_ln(stderr, _("Generally this means that you provided a wildcard refspec which had no\n"
415 "matches on the remote end."));
416 } else if (repo && curr_branch && (!remote || strcmp(repo, remote))) {
417 fprintf_ln(stderr, _("You asked to pull from the remote '%s', but did not specify\n"
418 "a branch. Because this is not the default configured remote\n"
419 "for your current branch, you must specify a branch on the command line."),
421 } else if (!curr_branch) {
422 fprintf_ln(stderr, _("You are not currently on a branch."));
424 fprintf_ln(stderr, _("Please specify which branch you want to rebase against."));
426 fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
427 fprintf_ln(stderr, _("See git-pull(1) for details."));
428 fprintf(stderr, "\n");
429 fprintf_ln(stderr, " git pull %s %s", _("<remote>"), _("<branch>"));
430 fprintf(stderr, "\n");
431 } else if (!curr_branch->merge_nr) {
432 const char *remote_name = NULL;
434 if (for_each_remote(get_only_remote, &remote_name) || !remote_name)
435 remote_name = _("<remote>");
437 fprintf_ln(stderr, _("There is no tracking information for the current branch."));
439 fprintf_ln(stderr, _("Please specify which branch you want to rebase against."));
441 fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
442 fprintf_ln(stderr, _("See git-pull(1) for details."));
443 fprintf(stderr, "\n");
444 fprintf_ln(stderr, " git pull %s %s", _("<remote>"), _("<branch>"));
445 fprintf(stderr, "\n");
446 fprintf_ln(stderr, _("If you wish to set tracking information for this branch you can do so with:"));
447 fprintf(stderr, "\n");
448 fprintf_ln(stderr, " git branch --set-upstream-to=%s/%s %s\n",
449 remote_name, _("<branch>"), curr_branch->name);
451 fprintf_ln(stderr, _("Your configuration specifies to merge with the ref '%s'\n"
452 "from the remote, but no such ref was fetched."),
453 *curr_branch->merge_name);
458 * Parses argv into [<repo> [<refspecs>...]], returning their values in `repo`
459 * as a string and `refspecs` as a null-terminated array of strings. If `repo`
460 * is not provided in argv, it is set to NULL.
462 static void parse_repo_refspecs(int argc, const char **argv, const char **repo,
463 const char ***refspecs)
474 * Runs git-fetch, returning its exit status. `repo` and `refspecs` are the
475 * repository and refspecs to fetch, or NULL if they are not provided.
477 static int run_fetch(const char *repo, const char **refspecs)
479 struct argv_array args = ARGV_ARRAY_INIT;
482 argv_array_pushl(&args, "fetch", "--update-head-ok", NULL);
485 argv_push_verbosity(&args);
487 argv_array_push(&args, opt_progress);
489 /* Options passed to git-fetch */
491 argv_array_push(&args, opt_all);
493 argv_array_push(&args, opt_append);
495 argv_array_push(&args, opt_upload_pack);
496 argv_push_force(&args);
498 argv_array_push(&args, opt_tags);
500 argv_array_push(&args, opt_prune);
501 if (recurse_submodules != RECURSE_SUBMODULES_DEFAULT)
502 switch (recurse_submodules) {
503 case RECURSE_SUBMODULES_ON:
504 argv_array_push(&args, "--recurse-submodules=on");
506 case RECURSE_SUBMODULES_OFF:
507 argv_array_push(&args, "--recurse-submodules=no");
509 case RECURSE_SUBMODULES_ON_DEMAND:
510 argv_array_push(&args, "--recurse-submodules=on-demand");
513 BUG("submodule recursion option not understood");
516 argv_array_push(&args, max_children);
518 argv_array_push(&args, "--dry-run");
520 argv_array_push(&args, opt_keep);
522 argv_array_push(&args, opt_depth);
524 argv_array_push(&args, opt_unshallow);
525 if (opt_update_shallow)
526 argv_array_push(&args, opt_update_shallow);
528 argv_array_push(&args, opt_refmap);
530 argv_array_push(&args, opt_ipv4);
532 argv_array_push(&args, opt_ipv6);
535 argv_array_push(&args, repo);
536 argv_array_pushv(&args, refspecs);
537 } else if (*refspecs)
538 die("BUG: refspecs without repo?");
539 ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
540 argv_array_clear(&args);
545 * "Pulls into void" by branching off merge_head.
547 static int pull_into_void(const struct object_id *merge_head,
548 const struct object_id *curr_head)
551 * Two-way merge: we treat the index as based on an empty tree,
552 * and try to fast-forward to HEAD. This ensures we will not lose
553 * index/worktree changes that the user already made on the unborn
556 if (checkout_fast_forward(&empty_tree_oid, merge_head, 0))
559 if (update_ref("initial pull", "HEAD", merge_head->hash, curr_head->hash, 0, UPDATE_REFS_DIE_ON_ERR))
565 static int rebase_submodules(void)
567 struct child_process cp = CHILD_PROCESS_INIT;
571 argv_array_pushl(&cp.args, "submodule", "update",
572 "--recursive", "--rebase", NULL);
574 return run_command(&cp);
577 static int update_submodules(void)
579 struct child_process cp = CHILD_PROCESS_INIT;
583 argv_array_pushl(&cp.args, "submodule", "update",
584 "--recursive", "--checkout", NULL);
586 return run_command(&cp);
590 * Runs git-merge, returning its exit status.
592 static int run_merge(void)
595 struct argv_array args = ARGV_ARRAY_INIT;
597 argv_array_pushl(&args, "merge", NULL);
600 argv_push_verbosity(&args);
602 argv_array_push(&args, opt_progress);
604 /* Options passed to git-merge */
606 argv_array_push(&args, opt_diffstat);
608 argv_array_push(&args, opt_log);
610 argv_array_push(&args, opt_squash);
612 argv_array_push(&args, opt_commit);
614 argv_array_push(&args, opt_edit);
616 argv_array_push(&args, opt_ff);
617 if (opt_verify_signatures)
618 argv_array_push(&args, opt_verify_signatures);
619 argv_array_pushv(&args, opt_strategies.argv);
620 argv_array_pushv(&args, opt_strategy_opts.argv);
622 argv_array_push(&args, opt_gpg_sign);
623 if (opt_allow_unrelated_histories > 0)
624 argv_array_push(&args, "--allow-unrelated-histories");
626 argv_array_push(&args, "FETCH_HEAD");
627 ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
628 argv_array_clear(&args);
633 * Returns remote's upstream branch for the current branch. If remote is NULL,
634 * the current branch's configured default remote is used. Returns NULL if
635 * `remote` does not name a valid remote, HEAD does not point to a branch,
636 * remote is not the branch's configured remote or the branch does not have any
637 * configured upstream branch.
639 static const char *get_upstream_branch(const char *remote)
642 struct branch *curr_branch;
643 const char *curr_branch_remote;
645 rm = remote_get(remote);
649 curr_branch = branch_get("HEAD");
653 curr_branch_remote = remote_for_branch(curr_branch, NULL);
654 assert(curr_branch_remote);
656 if (strcmp(curr_branch_remote, rm->name))
659 return branch_get_upstream(curr_branch, NULL);
663 * Derives the remote tracking branch from the remote and refspec.
665 * FIXME: The current implementation assumes the default mapping of
666 * refs/heads/<branch_name> to refs/remotes/<remote_name>/<branch_name>.
668 static const char *get_tracking_branch(const char *remote, const char *refspec)
670 struct refspec *spec;
671 const char *spec_src;
672 const char *merge_branch;
674 spec = parse_fetch_refspec(1, &refspec);
675 spec_src = spec->src;
676 if (!*spec_src || !strcmp(spec_src, "HEAD"))
678 else if (skip_prefix(spec_src, "heads/", &spec_src))
680 else if (skip_prefix(spec_src, "refs/heads/", &spec_src))
682 else if (starts_with(spec_src, "refs/") ||
683 starts_with(spec_src, "tags/") ||
684 starts_with(spec_src, "remotes/"))
688 if (!strcmp(remote, "."))
689 merge_branch = mkpath("refs/heads/%s", spec_src);
691 merge_branch = mkpath("refs/remotes/%s/%s", remote, spec_src);
695 free_refspec(1, spec);
700 * Given the repo and refspecs, sets fork_point to the point at which the
701 * current branch forked from its remote tracking branch. Returns 0 on success,
704 static int get_rebase_fork_point(struct object_id *fork_point, const char *repo,
708 struct branch *curr_branch;
709 const char *remote_branch;
710 struct child_process cp = CHILD_PROCESS_INIT;
711 struct strbuf sb = STRBUF_INIT;
713 curr_branch = branch_get("HEAD");
718 remote_branch = get_tracking_branch(repo, refspec);
720 remote_branch = get_upstream_branch(repo);
725 argv_array_pushl(&cp.args, "merge-base", "--fork-point",
726 remote_branch, curr_branch->name, NULL);
731 ret = capture_command(&cp, &sb, GIT_SHA1_HEXSZ);
735 ret = get_oid_hex(sb.buf, fork_point);
745 * Sets merge_base to the octopus merge base of curr_head, merge_head and
746 * fork_point. Returns 0 if a merge base is found, 1 otherwise.
748 static int get_octopus_merge_base(struct object_id *merge_base,
749 const struct object_id *curr_head,
750 const struct object_id *merge_head,
751 const struct object_id *fork_point)
753 struct commit_list *revs = NULL, *result;
755 commit_list_insert(lookup_commit_reference(curr_head), &revs);
756 commit_list_insert(lookup_commit_reference(merge_head), &revs);
757 if (!is_null_oid(fork_point))
758 commit_list_insert(lookup_commit_reference(fork_point), &revs);
760 result = get_octopus_merge_bases(revs);
761 free_commit_list(revs);
762 reduce_heads_replace(&result);
767 oidcpy(merge_base, &result->item->object.oid);
768 free_commit_list(result);
773 * Given the current HEAD SHA1, the merge head returned from git-fetch and the
774 * fork point calculated by get_rebase_fork_point(), runs git-rebase with the
775 * appropriate arguments and returns its exit status.
777 static int run_rebase(const struct object_id *curr_head,
778 const struct object_id *merge_head,
779 const struct object_id *fork_point)
782 struct object_id oct_merge_base;
783 struct argv_array args = ARGV_ARRAY_INIT;
785 if (!get_octopus_merge_base(&oct_merge_base, curr_head, merge_head, fork_point))
786 if (!is_null_oid(fork_point) && !oidcmp(&oct_merge_base, fork_point))
789 argv_array_push(&args, "rebase");
792 argv_push_verbosity(&args);
794 /* Options passed to git-rebase */
795 if (opt_rebase == REBASE_PRESERVE)
796 argv_array_push(&args, "--preserve-merges");
797 else if (opt_rebase == REBASE_INTERACTIVE)
798 argv_array_push(&args, "--interactive");
800 argv_array_push(&args, opt_diffstat);
801 argv_array_pushv(&args, opt_strategies.argv);
802 argv_array_pushv(&args, opt_strategy_opts.argv);
804 argv_array_push(&args, opt_gpg_sign);
805 if (opt_autostash == 0)
806 argv_array_push(&args, "--no-autostash");
807 else if (opt_autostash == 1)
808 argv_array_push(&args, "--autostash");
809 if (opt_verify_signatures &&
810 !strcmp(opt_verify_signatures, "--verify-signatures"))
811 warning(_("ignoring --verify-signatures for rebase"));
813 argv_array_push(&args, "--onto");
814 argv_array_push(&args, oid_to_hex(merge_head));
816 if (fork_point && !is_null_oid(fork_point))
817 argv_array_push(&args, oid_to_hex(fork_point));
819 argv_array_push(&args, oid_to_hex(merge_head));
821 ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
822 argv_array_clear(&args);
826 int cmd_pull(int argc, const char **argv, const char *prefix)
828 const char *repo, **refspecs;
829 struct oid_array merge_heads = OID_ARRAY_INIT;
830 struct object_id orig_head, curr_head;
831 struct object_id rebase_fork_point;
834 if (!getenv("GIT_REFLOG_ACTION"))
835 set_reflog_message(argc, argv);
837 git_config(git_pull_config, NULL);
839 argc = parse_options(argc, argv, prefix, pull_options, pull_usage, 0);
841 parse_repo_refspecs(argc, argv, &repo, &refspecs);
844 opt_ff = xstrdup_or_null(config_get_ff());
847 opt_rebase = config_get_rebase();
849 if (read_cache_unmerged())
850 die_resolve_conflict("pull");
852 if (file_exists(git_path_merge_head()))
853 die_conclude_merge();
855 if (get_oid("HEAD", &orig_head))
858 if (!opt_rebase && opt_autostash != -1)
859 die(_("--[no-]autostash option is only valid with --rebase."));
861 autostash = config_autostash;
863 if (opt_autostash != -1)
864 autostash = opt_autostash;
866 if (is_null_oid(&orig_head) && !is_cache_unborn())
867 die(_("Updating an unborn branch with changes added to the index."));
870 require_clean_work_tree(N_("pull with rebase"),
871 _("please commit or stash them."), 1, 0);
873 if (get_rebase_fork_point(&rebase_fork_point, repo, *refspecs))
874 oidclr(&rebase_fork_point);
877 if (run_fetch(repo, refspecs))
883 if (get_oid("HEAD", &curr_head))
886 if (!is_null_oid(&orig_head) && !is_null_oid(&curr_head) &&
887 oidcmp(&orig_head, &curr_head)) {
889 * The fetch involved updating the current branch.
891 * The working tree and the index file are still based on
892 * orig_head commit, but we are merging into curr_head.
893 * Update the working tree to match curr_head.
896 warning(_("fetch updated the current branch head.\n"
897 "fast-forwarding your working tree from\n"
898 "commit %s."), oid_to_hex(&orig_head));
900 if (checkout_fast_forward(&orig_head, &curr_head, 0))
901 die(_("Cannot fast-forward your working tree.\n"
902 "After making sure that you saved anything precious from\n"
905 "$ git reset --hard\n"
906 "to recover."), oid_to_hex(&orig_head));
909 get_merge_heads(&merge_heads);
912 die_no_merge_candidates(repo, refspecs);
914 if (is_null_oid(&orig_head)) {
915 if (merge_heads.nr > 1)
916 die(_("Cannot merge multiple branches into empty head."));
917 return pull_into_void(merge_heads.oid, &curr_head);
919 if (opt_rebase && merge_heads.nr > 1)
920 die(_("Cannot rebase onto multiple branches."));
924 if ((recurse_submodules == RECURSE_SUBMODULES_ON ||
925 recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) &&
926 submodule_touches_in_range(&rebase_fork_point, &curr_head))
927 die(_("cannot rebase with locally recorded submodule modifications"));
929 struct commit_list *list = NULL;
930 struct commit *merge_head, *head;
932 head = lookup_commit_reference(&orig_head);
933 commit_list_insert(head, &list);
934 merge_head = lookup_commit_reference(&merge_heads.oid[0]);
935 if (is_descendant_of(merge_head, list)) {
936 /* we can fast-forward this without invoking rebase */
937 opt_ff = "--ff-only";
941 ret = run_rebase(&curr_head, merge_heads.oid, &rebase_fork_point);
943 if (!ret && (recurse_submodules == RECURSE_SUBMODULES_ON ||
944 recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND))
945 ret = rebase_submodules();
949 int ret = run_merge();
950 if (!ret && (recurse_submodules == RECURSE_SUBMODULES_ON ||
951 recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND))
952 ret = update_submodules();