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"
35 * Parses the value of --rebase. If value is a false value, returns
36 * REBASE_FALSE. If value is a true value, returns REBASE_TRUE. If value is
37 * "merges", returns REBASE_MERGES. If value is "preserve", returns
38 * REBASE_PRESERVE. If value is a invalid value, dies with a fatal error if
39 * fatal is true, otherwise returns REBASE_INVALID.
41 static enum rebase_type
parse_config_rebase(const char *key
, const char *value
,
44 int v
= git_parse_maybe_bool(value
);
50 else if (!strcmp(value
, "preserve"))
51 return REBASE_PRESERVE
;
52 else if (!strcmp(value
, "merges"))
54 else if (!strcmp(value
, "interactive"))
55 return REBASE_INTERACTIVE
;
58 die(_("Invalid value for %s: %s"), key
, value
);
60 error(_("Invalid value for %s: %s"), key
, value
);
62 return REBASE_INVALID
;
66 * Callback for --rebase, which parses arg with parse_config_rebase().
68 static int parse_opt_rebase(const struct option
*opt
, const char *arg
, int unset
)
70 enum rebase_type
*value
= opt
->value
;
73 *value
= parse_config_rebase("--rebase", arg
, 0);
75 *value
= unset
? REBASE_FALSE
: REBASE_TRUE
;
76 return *value
== REBASE_INVALID
? -1 : 0;
79 static const char * const pull_usage
[] = {
80 N_("git pull [<options>] [<repository> [<refspec>...]]"),
85 static int opt_verbosity
;
86 static char *opt_progress
;
87 static int recurse_submodules
= RECURSE_SUBMODULES_DEFAULT
;
89 /* Options passed to git-merge or git-rebase */
90 static enum rebase_type opt_rebase
= -1;
91 static char *opt_diffstat
;
93 static char *opt_signoff
;
94 static char *opt_squash
;
95 static char *opt_commit
;
96 static char *opt_edit
;
98 static char *opt_verify_signatures
;
99 static int opt_autostash
= -1;
100 static int config_autostash
;
101 static struct argv_array opt_strategies
= ARGV_ARRAY_INIT
;
102 static struct argv_array opt_strategy_opts
= ARGV_ARRAY_INIT
;
103 static char *opt_gpg_sign
;
104 static int opt_allow_unrelated_histories
;
106 /* Options passed to git-fetch */
107 static char *opt_all
;
108 static char *opt_append
;
109 static char *opt_upload_pack
;
110 static int opt_force
;
111 static char *opt_tags
;
112 static char *opt_prune
;
113 static char *max_children
;
114 static int opt_dry_run
;
115 static char *opt_keep
;
116 static char *opt_depth
;
117 static char *opt_unshallow
;
118 static char *opt_update_shallow
;
119 static char *opt_refmap
;
120 static char *opt_ipv4
;
121 static char *opt_ipv6
;
123 static struct option pull_options
[] = {
125 OPT__VERBOSITY(&opt_verbosity
),
126 OPT_PASSTHRU(0, "progress", &opt_progress
, NULL
,
127 N_("force progress reporting"),
129 { OPTION_CALLBACK
, 0, "recurse-submodules",
130 &recurse_submodules
, N_("on-demand"),
131 N_("control for recursive fetching of submodules"),
132 PARSE_OPT_OPTARG
, option_fetch_parse_recurse_submodules
},
134 /* Options passed to git-merge or git-rebase */
135 OPT_GROUP(N_("Options related to merging")),
136 { OPTION_CALLBACK
, 'r', "rebase", &opt_rebase
,
137 "false|true|merges|preserve|interactive",
138 N_("incorporate changes by rebasing rather than merging"),
139 PARSE_OPT_OPTARG
, parse_opt_rebase
},
140 OPT_PASSTHRU('n', NULL
, &opt_diffstat
, NULL
,
141 N_("do not show a diffstat at the end of the merge"),
142 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
),
143 OPT_PASSTHRU(0, "stat", &opt_diffstat
, NULL
,
144 N_("show a diffstat at the end of the merge"),
146 OPT_PASSTHRU(0, "summary", &opt_diffstat
, NULL
,
147 N_("(synonym to --stat)"),
148 PARSE_OPT_NOARG
| PARSE_OPT_HIDDEN
),
149 OPT_PASSTHRU(0, "log", &opt_log
, N_("n"),
150 N_("add (at most <n>) entries from shortlog to merge commit message"),
152 OPT_PASSTHRU(0, "signoff", &opt_signoff
, NULL
,
153 N_("add Signed-off-by:"),
155 OPT_PASSTHRU(0, "squash", &opt_squash
, NULL
,
156 N_("create a single commit instead of doing a merge"),
158 OPT_PASSTHRU(0, "commit", &opt_commit
, NULL
,
159 N_("perform a commit if the merge succeeds (default)"),
161 OPT_PASSTHRU(0, "edit", &opt_edit
, NULL
,
162 N_("edit message before committing"),
164 OPT_PASSTHRU(0, "ff", &opt_ff
, NULL
,
165 N_("allow fast-forward"),
167 OPT_PASSTHRU(0, "ff-only", &opt_ff
, NULL
,
168 N_("abort if fast-forward is not possible"),
169 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
),
170 OPT_PASSTHRU(0, "verify-signatures", &opt_verify_signatures
, NULL
,
171 N_("verify that the named commit has a valid GPG signature"),
173 OPT_BOOL(0, "autostash", &opt_autostash
,
174 N_("automatically stash/stash pop before and after rebase")),
175 OPT_PASSTHRU_ARGV('s', "strategy", &opt_strategies
, N_("strategy"),
176 N_("merge strategy to use"),
178 OPT_PASSTHRU_ARGV('X', "strategy-option", &opt_strategy_opts
,
180 N_("option for selected merge strategy"),
182 OPT_PASSTHRU('S', "gpg-sign", &opt_gpg_sign
, N_("key-id"),
183 N_("GPG sign commit"),
185 OPT_SET_INT(0, "allow-unrelated-histories",
186 &opt_allow_unrelated_histories
,
187 N_("allow merging unrelated histories"), 1),
189 /* Options passed to git-fetch */
190 OPT_GROUP(N_("Options related to fetching")),
191 OPT_PASSTHRU(0, "all", &opt_all
, NULL
,
192 N_("fetch from all remotes"),
194 OPT_PASSTHRU('a', "append", &opt_append
, NULL
,
195 N_("append to .git/FETCH_HEAD instead of overwriting"),
197 OPT_PASSTHRU(0, "upload-pack", &opt_upload_pack
, N_("path"),
198 N_("path to upload pack on remote end"),
200 OPT__FORCE(&opt_force
, N_("force overwrite of local branch"), 0),
201 OPT_PASSTHRU('t', "tags", &opt_tags
, NULL
,
202 N_("fetch all tags and associated objects"),
204 OPT_PASSTHRU('p', "prune", &opt_prune
, NULL
,
205 N_("prune remote-tracking branches no longer on remote"),
207 OPT_PASSTHRU('j', "jobs", &max_children
, N_("n"),
208 N_("number of submodules pulled in parallel"),
210 OPT_BOOL(0, "dry-run", &opt_dry_run
,
212 OPT_PASSTHRU('k', "keep", &opt_keep
, NULL
,
213 N_("keep downloaded pack"),
215 OPT_PASSTHRU(0, "depth", &opt_depth
, N_("depth"),
216 N_("deepen history of shallow clone"),
218 OPT_PASSTHRU(0, "unshallow", &opt_unshallow
, NULL
,
219 N_("convert to a complete repository"),
220 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
),
221 OPT_PASSTHRU(0, "update-shallow", &opt_update_shallow
, NULL
,
222 N_("accept refs that update .git/shallow"),
224 OPT_PASSTHRU(0, "refmap", &opt_refmap
, N_("refmap"),
225 N_("specify fetch refmap"),
227 OPT_PASSTHRU('4', "ipv4", &opt_ipv4
, NULL
,
228 N_("use IPv4 addresses only"),
230 OPT_PASSTHRU('6', "ipv6", &opt_ipv6
, NULL
,
231 N_("use IPv6 addresses only"),
238 * Pushes "-q" or "-v" switches into arr to match the opt_verbosity level.
240 static void argv_push_verbosity(struct argv_array
*arr
)
244 for (verbosity
= opt_verbosity
; verbosity
> 0; verbosity
--)
245 argv_array_push(arr
, "-v");
247 for (verbosity
= opt_verbosity
; verbosity
< 0; verbosity
++)
248 argv_array_push(arr
, "-q");
252 * Pushes "-f" switches into arr to match the opt_force level.
254 static void argv_push_force(struct argv_array
*arr
)
256 int force
= opt_force
;
258 argv_array_push(arr
, "-f");
262 * Sets the GIT_REFLOG_ACTION environment variable to the concatenation of argv
264 static void set_reflog_message(int argc
, const char **argv
)
267 struct strbuf msg
= STRBUF_INIT
;
269 for (i
= 0; i
< argc
; i
++) {
271 strbuf_addch(&msg
, ' ');
272 strbuf_addstr(&msg
, argv
[i
]);
275 setenv("GIT_REFLOG_ACTION", msg
.buf
, 0);
277 strbuf_release(&msg
);
281 * If pull.ff is unset, returns NULL. If pull.ff is "true", returns "--ff". If
282 * pull.ff is "false", returns "--no-ff". If pull.ff is "only", returns
283 * "--ff-only". Otherwise, if pull.ff is set to an invalid value, die with an
286 static const char *config_get_ff(void)
290 if (git_config_get_value("pull.ff", &value
))
293 switch (git_parse_maybe_bool(value
)) {
300 if (!strcmp(value
, "only"))
303 die(_("Invalid value for pull.ff: %s"), value
);
307 * Returns the default configured value for --rebase. It first looks for the
308 * value of "branch.$curr_branch.rebase", where $curr_branch is the current
309 * branch, and if HEAD is detached or the configuration key does not exist,
310 * looks for the value of "pull.rebase". If both configuration keys do not
311 * exist, returns REBASE_FALSE.
313 static enum rebase_type
config_get_rebase(void)
315 struct branch
*curr_branch
= branch_get("HEAD");
319 char *key
= xstrfmt("branch.%s.rebase", curr_branch
->name
);
321 if (!git_config_get_value(key
, &value
)) {
322 enum rebase_type ret
= parse_config_rebase(key
, value
, 1);
330 if (!git_config_get_value("pull.rebase", &value
))
331 return parse_config_rebase("pull.rebase", value
, 1);
337 * Read config variables.
339 static int git_pull_config(const char *var
, const char *value
, void *cb
)
341 if (!strcmp(var
, "rebase.autostash")) {
342 config_autostash
= git_config_bool(var
, value
);
344 } else if (!strcmp(var
, "submodule.recurse")) {
345 recurse_submodules
= git_config_bool(var
, value
) ?
346 RECURSE_SUBMODULES_ON
: RECURSE_SUBMODULES_OFF
;
349 return git_default_config(var
, value
, cb
);
353 * Appends merge candidates from FETCH_HEAD that are not marked not-for-merge
356 static void get_merge_heads(struct oid_array
*merge_heads
)
358 const char *filename
= git_path_fetch_head();
360 struct strbuf sb
= STRBUF_INIT
;
361 struct object_id oid
;
363 fp
= xfopen(filename
, "r");
364 while (strbuf_getline_lf(&sb
, fp
) != EOF
) {
365 if (get_oid_hex(sb
.buf
, &oid
))
366 continue; /* invalid line: does not start with SHA1 */
367 if (starts_with(sb
.buf
+ GIT_SHA1_HEXSZ
, "\tnot-for-merge\t"))
368 continue; /* ref is not-for-merge */
369 oid_array_append(merge_heads
, &oid
);
376 * Used by die_no_merge_candidates() as a for_each_remote() callback to
377 * retrieve the name of the remote if the repository only has one remote.
379 static int get_only_remote(struct remote
*remote
, void *cb_data
)
381 const char **remote_name
= cb_data
;
386 *remote_name
= remote
->name
;
391 * Dies with the appropriate reason for why there are no merge candidates:
393 * 1. We fetched from a specific remote, and a refspec was given, but it ended
394 * up not fetching anything. This is usually because the user provided a
395 * wildcard refspec which had no matches on the remote end.
397 * 2. We fetched from a non-default remote, but didn't specify a branch to
398 * merge. We can't use the configured one because it applies to the default
399 * remote, thus the user must specify the branches to merge.
401 * 3. We fetched from the branch's or repo's default remote, but:
403 * a. We are not on a branch, so there will never be a configured branch to
406 * b. We are on a branch, but there is no configured branch to merge with.
408 * 4. We fetched from the branch's or repo's default remote, but the configured
409 * branch to merge didn't get fetched. (Either it doesn't exist, or wasn't
410 * part of the configured fetch refspec.)
412 static void NORETURN
die_no_merge_candidates(const char *repo
, const char **refspecs
)
414 struct branch
*curr_branch
= branch_get("HEAD");
415 const char *remote
= curr_branch
? curr_branch
->remote_name
: NULL
;
419 fprintf_ln(stderr
, _("There is no candidate for rebasing against among the refs that you just fetched."));
421 fprintf_ln(stderr
, _("There are no candidates for merging among the refs that you just fetched."));
422 fprintf_ln(stderr
, _("Generally this means that you provided a wildcard refspec which had no\n"
423 "matches on the remote end."));
424 } else if (repo
&& curr_branch
&& (!remote
|| strcmp(repo
, remote
))) {
425 fprintf_ln(stderr
, _("You asked to pull from the remote '%s', but did not specify\n"
426 "a branch. Because this is not the default configured remote\n"
427 "for your current branch, you must specify a branch on the command line."),
429 } else if (!curr_branch
) {
430 fprintf_ln(stderr
, _("You are not currently on a branch."));
432 fprintf_ln(stderr
, _("Please specify which branch you want to rebase against."));
434 fprintf_ln(stderr
, _("Please specify which branch you want to merge with."));
435 fprintf_ln(stderr
, _("See git-pull(1) for details."));
436 fprintf(stderr
, "\n");
437 fprintf_ln(stderr
, " git pull %s %s", _("<remote>"), _("<branch>"));
438 fprintf(stderr
, "\n");
439 } else if (!curr_branch
->merge_nr
) {
440 const char *remote_name
= NULL
;
442 if (for_each_remote(get_only_remote
, &remote_name
) || !remote_name
)
443 remote_name
= _("<remote>");
445 fprintf_ln(stderr
, _("There is no tracking information for the current branch."));
447 fprintf_ln(stderr
, _("Please specify which branch you want to rebase against."));
449 fprintf_ln(stderr
, _("Please specify which branch you want to merge with."));
450 fprintf_ln(stderr
, _("See git-pull(1) for details."));
451 fprintf(stderr
, "\n");
452 fprintf_ln(stderr
, " git pull %s %s", _("<remote>"), _("<branch>"));
453 fprintf(stderr
, "\n");
454 fprintf_ln(stderr
, _("If you wish to set tracking information for this branch you can do so with:"));
455 fprintf(stderr
, "\n");
456 fprintf_ln(stderr
, " git branch --set-upstream-to=%s/%s %s\n",
457 remote_name
, _("<branch>"), curr_branch
->name
);
459 fprintf_ln(stderr
, _("Your configuration specifies to merge with the ref '%s'\n"
460 "from the remote, but no such ref was fetched."),
461 *curr_branch
->merge_name
);
466 * Parses argv into [<repo> [<refspecs>...]], returning their values in `repo`
467 * as a string and `refspecs` as a null-terminated array of strings. If `repo`
468 * is not provided in argv, it is set to NULL.
470 static void parse_repo_refspecs(int argc
, const char **argv
, const char **repo
,
471 const char ***refspecs
)
482 * Runs git-fetch, returning its exit status. `repo` and `refspecs` are the
483 * repository and refspecs to fetch, or NULL if they are not provided.
485 static int run_fetch(const char *repo
, const char **refspecs
)
487 struct argv_array args
= ARGV_ARRAY_INIT
;
490 argv_array_pushl(&args
, "fetch", "--update-head-ok", NULL
);
493 argv_push_verbosity(&args
);
495 argv_array_push(&args
, opt_progress
);
497 /* Options passed to git-fetch */
499 argv_array_push(&args
, opt_all
);
501 argv_array_push(&args
, opt_append
);
503 argv_array_push(&args
, opt_upload_pack
);
504 argv_push_force(&args
);
506 argv_array_push(&args
, opt_tags
);
508 argv_array_push(&args
, opt_prune
);
509 if (recurse_submodules
!= RECURSE_SUBMODULES_DEFAULT
)
510 switch (recurse_submodules
) {
511 case RECURSE_SUBMODULES_ON
:
512 argv_array_push(&args
, "--recurse-submodules=on");
514 case RECURSE_SUBMODULES_OFF
:
515 argv_array_push(&args
, "--recurse-submodules=no");
517 case RECURSE_SUBMODULES_ON_DEMAND
:
518 argv_array_push(&args
, "--recurse-submodules=on-demand");
521 BUG("submodule recursion option not understood");
524 argv_array_push(&args
, max_children
);
526 argv_array_push(&args
, "--dry-run");
528 argv_array_push(&args
, opt_keep
);
530 argv_array_push(&args
, opt_depth
);
532 argv_array_push(&args
, opt_unshallow
);
533 if (opt_update_shallow
)
534 argv_array_push(&args
, opt_update_shallow
);
536 argv_array_push(&args
, opt_refmap
);
538 argv_array_push(&args
, opt_ipv4
);
540 argv_array_push(&args
, opt_ipv6
);
543 argv_array_push(&args
, repo
);
544 argv_array_pushv(&args
, refspecs
);
545 } else if (*refspecs
)
546 die("BUG: refspecs without repo?");
547 ret
= run_command_v_opt(args
.argv
, RUN_GIT_CMD
);
548 argv_array_clear(&args
);
553 * "Pulls into void" by branching off merge_head.
555 static int pull_into_void(const struct object_id
*merge_head
,
556 const struct object_id
*curr_head
)
559 * Two-way merge: we treat the index as based on an empty tree,
560 * and try to fast-forward to HEAD. This ensures we will not lose
561 * index/worktree changes that the user already made on the unborn
564 if (checkout_fast_forward(the_hash_algo
->empty_tree
, merge_head
, 0))
567 if (update_ref("initial pull", "HEAD", merge_head
, curr_head
, 0, UPDATE_REFS_DIE_ON_ERR
))
573 static int rebase_submodules(void)
575 struct child_process cp
= CHILD_PROCESS_INIT
;
579 argv_array_pushl(&cp
.args
, "submodule", "update",
580 "--recursive", "--rebase", NULL
);
581 argv_push_verbosity(&cp
.args
);
583 return run_command(&cp
);
586 static int update_submodules(void)
588 struct child_process cp
= CHILD_PROCESS_INIT
;
592 argv_array_pushl(&cp
.args
, "submodule", "update",
593 "--recursive", "--checkout", NULL
);
594 argv_push_verbosity(&cp
.args
);
596 return run_command(&cp
);
600 * Runs git-merge, returning its exit status.
602 static int run_merge(void)
605 struct argv_array args
= ARGV_ARRAY_INIT
;
607 argv_array_pushl(&args
, "merge", NULL
);
610 argv_push_verbosity(&args
);
612 argv_array_push(&args
, opt_progress
);
614 /* Options passed to git-merge */
616 argv_array_push(&args
, opt_diffstat
);
618 argv_array_push(&args
, opt_log
);
620 argv_array_push(&args
, opt_signoff
);
622 argv_array_push(&args
, opt_squash
);
624 argv_array_push(&args
, opt_commit
);
626 argv_array_push(&args
, opt_edit
);
628 argv_array_push(&args
, opt_ff
);
629 if (opt_verify_signatures
)
630 argv_array_push(&args
, opt_verify_signatures
);
631 argv_array_pushv(&args
, opt_strategies
.argv
);
632 argv_array_pushv(&args
, opt_strategy_opts
.argv
);
634 argv_array_push(&args
, opt_gpg_sign
);
635 if (opt_allow_unrelated_histories
> 0)
636 argv_array_push(&args
, "--allow-unrelated-histories");
638 argv_array_push(&args
, "FETCH_HEAD");
639 ret
= run_command_v_opt(args
.argv
, RUN_GIT_CMD
);
640 argv_array_clear(&args
);
645 * Returns remote's upstream branch for the current branch. If remote is NULL,
646 * the current branch's configured default remote is used. Returns NULL if
647 * `remote` does not name a valid remote, HEAD does not point to a branch,
648 * remote is not the branch's configured remote or the branch does not have any
649 * configured upstream branch.
651 static const char *get_upstream_branch(const char *remote
)
654 struct branch
*curr_branch
;
655 const char *curr_branch_remote
;
657 rm
= remote_get(remote
);
661 curr_branch
= branch_get("HEAD");
665 curr_branch_remote
= remote_for_branch(curr_branch
, NULL
);
666 assert(curr_branch_remote
);
668 if (strcmp(curr_branch_remote
, rm
->name
))
671 return branch_get_upstream(curr_branch
, NULL
);
675 * Derives the remote tracking branch from the remote and refspec.
677 * FIXME: The current implementation assumes the default mapping of
678 * refs/heads/<branch_name> to refs/remotes/<remote_name>/<branch_name>.
680 static const char *get_tracking_branch(const char *remote
, const char *refspec
)
682 struct refspec
*spec
;
683 const char *spec_src
;
684 const char *merge_branch
;
686 spec
= parse_fetch_refspec(1, &refspec
);
687 spec_src
= spec
->src
;
688 if (!*spec_src
|| !strcmp(spec_src
, "HEAD"))
690 else if (skip_prefix(spec_src
, "heads/", &spec_src
))
692 else if (skip_prefix(spec_src
, "refs/heads/", &spec_src
))
694 else if (starts_with(spec_src
, "refs/") ||
695 starts_with(spec_src
, "tags/") ||
696 starts_with(spec_src
, "remotes/"))
700 if (!strcmp(remote
, "."))
701 merge_branch
= mkpath("refs/heads/%s", spec_src
);
703 merge_branch
= mkpath("refs/remotes/%s/%s", remote
, spec_src
);
707 free_refspec(1, spec
);
712 * Given the repo and refspecs, sets fork_point to the point at which the
713 * current branch forked from its remote tracking branch. Returns 0 on success,
716 static int get_rebase_fork_point(struct object_id
*fork_point
, const char *repo
,
720 struct branch
*curr_branch
;
721 const char *remote_branch
;
722 struct child_process cp
= CHILD_PROCESS_INIT
;
723 struct strbuf sb
= STRBUF_INIT
;
725 curr_branch
= branch_get("HEAD");
730 remote_branch
= get_tracking_branch(repo
, refspec
);
732 remote_branch
= get_upstream_branch(repo
);
737 argv_array_pushl(&cp
.args
, "merge-base", "--fork-point",
738 remote_branch
, curr_branch
->name
, NULL
);
743 ret
= capture_command(&cp
, &sb
, GIT_SHA1_HEXSZ
);
747 ret
= get_oid_hex(sb
.buf
, fork_point
);
757 * Sets merge_base to the octopus merge base of curr_head, merge_head and
758 * fork_point. Returns 0 if a merge base is found, 1 otherwise.
760 static int get_octopus_merge_base(struct object_id
*merge_base
,
761 const struct object_id
*curr_head
,
762 const struct object_id
*merge_head
,
763 const struct object_id
*fork_point
)
765 struct commit_list
*revs
= NULL
, *result
;
767 commit_list_insert(lookup_commit_reference(curr_head
), &revs
);
768 commit_list_insert(lookup_commit_reference(merge_head
), &revs
);
769 if (!is_null_oid(fork_point
))
770 commit_list_insert(lookup_commit_reference(fork_point
), &revs
);
772 result
= get_octopus_merge_bases(revs
);
773 free_commit_list(revs
);
774 reduce_heads_replace(&result
);
779 oidcpy(merge_base
, &result
->item
->object
.oid
);
780 free_commit_list(result
);
785 * Given the current HEAD SHA1, the merge head returned from git-fetch and the
786 * fork point calculated by get_rebase_fork_point(), runs git-rebase with the
787 * appropriate arguments and returns its exit status.
789 static int run_rebase(const struct object_id
*curr_head
,
790 const struct object_id
*merge_head
,
791 const struct object_id
*fork_point
)
794 struct object_id oct_merge_base
;
795 struct argv_array args
= ARGV_ARRAY_INIT
;
797 if (!get_octopus_merge_base(&oct_merge_base
, curr_head
, merge_head
, fork_point
))
798 if (!is_null_oid(fork_point
) && !oidcmp(&oct_merge_base
, fork_point
))
801 argv_array_push(&args
, "rebase");
804 argv_push_verbosity(&args
);
806 /* Options passed to git-rebase */
807 if (opt_rebase
== REBASE_MERGES
)
808 argv_array_push(&args
, "--rebase-merges");
809 else if (opt_rebase
== REBASE_PRESERVE
)
810 argv_array_push(&args
, "--preserve-merges");
811 else if (opt_rebase
== REBASE_INTERACTIVE
)
812 argv_array_push(&args
, "--interactive");
814 argv_array_push(&args
, opt_diffstat
);
815 argv_array_pushv(&args
, opt_strategies
.argv
);
816 argv_array_pushv(&args
, opt_strategy_opts
.argv
);
818 argv_array_push(&args
, opt_gpg_sign
);
819 if (opt_autostash
== 0)
820 argv_array_push(&args
, "--no-autostash");
821 else if (opt_autostash
== 1)
822 argv_array_push(&args
, "--autostash");
823 if (opt_verify_signatures
&&
824 !strcmp(opt_verify_signatures
, "--verify-signatures"))
825 warning(_("ignoring --verify-signatures for rebase"));
827 argv_array_push(&args
, "--onto");
828 argv_array_push(&args
, oid_to_hex(merge_head
));
830 if (fork_point
&& !is_null_oid(fork_point
))
831 argv_array_push(&args
, oid_to_hex(fork_point
));
833 argv_array_push(&args
, oid_to_hex(merge_head
));
835 ret
= run_command_v_opt(args
.argv
, RUN_GIT_CMD
);
836 argv_array_clear(&args
);
840 int cmd_pull(int argc
, const char **argv
, const char *prefix
)
842 const char *repo
, **refspecs
;
843 struct oid_array merge_heads
= OID_ARRAY_INIT
;
844 struct object_id orig_head
, curr_head
;
845 struct object_id rebase_fork_point
;
848 if (!getenv("GIT_REFLOG_ACTION"))
849 set_reflog_message(argc
, argv
);
851 git_config(git_pull_config
, NULL
);
853 argc
= parse_options(argc
, argv
, prefix
, pull_options
, pull_usage
, 0);
855 parse_repo_refspecs(argc
, argv
, &repo
, &refspecs
);
858 opt_ff
= xstrdup_or_null(config_get_ff());
861 opt_rebase
= config_get_rebase();
863 if (read_cache_unmerged())
864 die_resolve_conflict("pull");
866 if (file_exists(git_path_merge_head()))
867 die_conclude_merge();
869 if (get_oid("HEAD", &orig_head
))
872 if (!opt_rebase
&& opt_autostash
!= -1)
873 die(_("--[no-]autostash option is only valid with --rebase."));
875 autostash
= config_autostash
;
877 if (opt_autostash
!= -1)
878 autostash
= opt_autostash
;
880 if (is_null_oid(&orig_head
) && !is_cache_unborn())
881 die(_("Updating an unborn branch with changes added to the index."));
884 require_clean_work_tree(N_("pull with rebase"),
885 _("please commit or stash them."), 1, 0);
887 if (get_rebase_fork_point(&rebase_fork_point
, repo
, *refspecs
))
888 oidclr(&rebase_fork_point
);
891 if (run_fetch(repo
, refspecs
))
897 if (get_oid("HEAD", &curr_head
))
900 if (!is_null_oid(&orig_head
) && !is_null_oid(&curr_head
) &&
901 oidcmp(&orig_head
, &curr_head
)) {
903 * The fetch involved updating the current branch.
905 * The working tree and the index file are still based on
906 * orig_head commit, but we are merging into curr_head.
907 * Update the working tree to match curr_head.
910 warning(_("fetch updated the current branch head.\n"
911 "fast-forwarding your working tree from\n"
912 "commit %s."), oid_to_hex(&orig_head
));
914 if (checkout_fast_forward(&orig_head
, &curr_head
, 0))
915 die(_("Cannot fast-forward your working tree.\n"
916 "After making sure that you saved anything precious from\n"
919 "$ git reset --hard\n"
920 "to recover."), oid_to_hex(&orig_head
));
923 get_merge_heads(&merge_heads
);
926 die_no_merge_candidates(repo
, refspecs
);
928 if (is_null_oid(&orig_head
)) {
929 if (merge_heads
.nr
> 1)
930 die(_("Cannot merge multiple branches into empty head."));
931 return pull_into_void(merge_heads
.oid
, &curr_head
);
933 if (opt_rebase
&& merge_heads
.nr
> 1)
934 die(_("Cannot rebase onto multiple branches."));
938 if ((recurse_submodules
== RECURSE_SUBMODULES_ON
||
939 recurse_submodules
== RECURSE_SUBMODULES_ON_DEMAND
) &&
940 submodule_touches_in_range(&rebase_fork_point
, &curr_head
))
941 die(_("cannot rebase with locally recorded submodule modifications"));
943 struct commit_list
*list
= NULL
;
944 struct commit
*merge_head
, *head
;
946 head
= lookup_commit_reference(&orig_head
);
947 commit_list_insert(head
, &list
);
948 merge_head
= lookup_commit_reference(&merge_heads
.oid
[0]);
949 if (is_descendant_of(merge_head
, list
)) {
950 /* we can fast-forward this without invoking rebase */
951 opt_ff
= "--ff-only";
955 ret
= run_rebase(&curr_head
, merge_heads
.oid
, &rebase_fork_point
);
957 if (!ret
&& (recurse_submodules
== RECURSE_SUBMODULES_ON
||
958 recurse_submodules
== RECURSE_SUBMODULES_ON_DEMAND
))
959 ret
= rebase_submodules();
963 int ret
= run_merge();
964 if (!ret
&& (recurse_submodules
== RECURSE_SUBMODULES_ON
||
965 recurse_submodules
== RECURSE_SUBMODULES_ON_DEMAND
))
966 ret
= update_submodules();