Merge branch 'jc/merge-bases'

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 3f2ad7727fbff9f12cb18c69d925e2717c2a768b..97a849a9dc082555fe1cbe6d0216d03563c75951 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -323,7 +323,7 @@ static int update_local_ref(struct ref *ref,
                return r;
        }
 
-       if (in_merge_bases(current, &updated, 1)) {
+       if (in_merge_bases(current, updated)) {
                char quickref[83];
                int r;
                strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));