in_merge_bases(): support only one "other" commit

[thirdparty/git.git] / fast-import.c

diff --git a/fast-import.c b/fast-import.c
index a85275dc682d2bb8068f003b8281c3933488f010..e6f61fc7cb404248c7d742346573874b3ec22226 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -1691,7 +1691,7 @@ static int update_branch(struct branch *b)
                        return error("Branch %s is missing commits.", b->name);
                }
 
-               if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
+               if (!in_merge_bases(old_cmit, new_cmit)) {
                        unlock_ref(lock);
                        warning("Not updating %s"
                                " (new tip %s does not contain %s)",