summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-05 00:18:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-05 00:18:13 (GMT)
commit35898eafab5dfd4ebc9daf2f4e422a1d4771954b (patch)
tree78d6fc54b2b26faa195ace41e7e771a9fe445bce /builtin
parent6e9b0108c6515510580da1698af893263f8cd7de (diff)
parentf15e7cf5cc95cbfd0d05c260f75631781e290edc (diff)
downloadgit-35898eafab5dfd4ebc9daf2f4e422a1d4771954b.zip
git-35898eafab5dfd4ebc9daf2f4e422a1d4771954b.tar.gz
git-35898eafab5dfd4ebc9daf2f4e422a1d4771954b.tar.bz2
Merge branch 'tb/pull-ff-rebase-autostash'
"git pull --rebase --autostash" didn't auto-stash when the local history fast-forwards to the upstream. * tb/pull-ff-rebase-autostash: pull: ff --rebase --autostash works in dirty repo
Diffstat (limited to 'builtin')
-rw-r--r--builtin/pull.c25
1 files changed, 14 insertions, 11 deletions
diff --git a/builtin/pull.c b/builtin/pull.c
index 318c273..da8b60f 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -772,6 +772,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
struct oid_array merge_heads = OID_ARRAY_INIT;
struct object_id orig_head, curr_head;
struct object_id rebase_fork_point;
+ int autostash;
if (!getenv("GIT_REFLOG_ACTION"))
set_reflog_message(argc, argv);
@@ -800,8 +801,8 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
if (!opt_rebase && opt_autostash != -1)
die(_("--[no-]autostash option is only valid with --rebase."));
+ autostash = config_autostash;
if (opt_rebase) {
- int autostash = config_autostash;
if (opt_autostash != -1)
autostash = opt_autostash;
@@ -862,16 +863,18 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
die(_("Cannot rebase onto multiple branches."));
if (opt_rebase) {
- struct commit_list *list = NULL;
- struct commit *merge_head, *head;
-
- head = lookup_commit_reference(&orig_head);
- commit_list_insert(head, &list);
- merge_head = lookup_commit_reference(&merge_heads.oid[0]);
- if (is_descendant_of(merge_head, list)) {
- /* we can fast-forward this without invoking rebase */
- opt_ff = "--ff-only";
- return run_merge();
+ if (!autostash) {
+ struct commit_list *list = NULL;
+ struct commit *merge_head, *head;
+
+ head = lookup_commit_reference(&orig_head);
+ commit_list_insert(head, &list);
+ merge_head = lookup_commit_reference(&merge_heads.oid[0]);
+ if (is_descendant_of(merge_head, list)) {
+ /* we can fast-forward this without invoking rebase */
+ opt_ff = "--ff-only";
+ return run_merge();
+ }
}
return run_rebase(&curr_head, merge_heads.oid, &rebase_fork_point);
} else {