diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 23:11:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 23:11:05 (GMT) |
| commit | e4ec4089883c9076744561863f9913bdefec06cf (patch) | |
| tree | 0da60edb46ca721baef5a128e3450cb6466d5f53 /builtin | |
| parent | 07ec05d9e6f54874c6a439fea35ec70ffa05c1a0 (diff) | |
| parent | 33b842a1e9bf28bcffe953ad9dcdbb0561336314 (diff) | |
| download | git-e4ec4089883c9076744561863f9913bdefec06cf.zip git-e4ec4089883c9076744561863f9913bdefec06cf.tar.gz git-e4ec4089883c9076744561863f9913bdefec06cf.tar.bz2 | |
Merge branch 'jc/pull-rebase-ff' into maint
"git pull --rebase", when there is no new commits on our side since
we forked from the upstream, should be able to fast-forward without
invoking "git rebase", but it didn't.
* jc/pull-rebase-ff:
pull: fast-forward "pull --rebase=true"
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/pull.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index d6e46ee..3ecb881 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -857,10 +857,24 @@ int cmd_pull(int argc, const char **argv, const char *prefix) if (merge_heads.nr > 1) die(_("Cannot merge multiple branches into empty head.")); return pull_into_void(*merge_heads.sha1, curr_head); - } else if (opt_rebase) { - if (merge_heads.nr > 1) - die(_("Cannot rebase onto multiple branches.")); + } + if (opt_rebase && merge_heads.nr > 1) + 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.sha1[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.sha1, rebase_fork_point); - } else + } else { return run_merge(); + } } |