diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-07-06 22:09:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-06 22:09:16 -0700 |
| commit | 0258ed1e08e7973f1d6829db8d33109851067a91 (patch) | |
| tree | c94e74d689f3b1ab05cf3a14392016795506d899 /builtin | |
| parent | Merge branch 'mk/pb-pretty-email-without-domain-part-fix' (diff) | |
| parent | commit-reach: avoid is_descendant_of() shim (diff) | |
| download | tgif-0258ed1e08e7973f1d6829db8d33109851067a91.tar.xz | |
Merge branch 'cb/is-descendant-of'
Code clean-up.
* cb/is-descendant-of:
commit-reach: avoid is_descendant_of() shim
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/pull.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 8e6572d305..8159c5d7c9 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -1025,7 +1025,8 @@ int cmd_pull(int argc, const char **argv, const char *prefix) commit_list_insert(head, &list); merge_head = lookup_commit_reference(the_repository, &merge_heads.oid[0]); - if (is_descendant_of(merge_head, list)) { + if (repo_is_descendant_of(the_repository, + merge_head, list)) { /* we can fast-forward this without invoking rebase */ opt_ff = "--ff-only"; ran_ff = 1; |