Merge branch 'js/poll-emu'

[git.git] / fast-import.c

diff --git a/fast-import.c b/fast-import.c
index eed97c8fa9f3e1624f69443e28f76d995e589b34..c2a814ec660862937e495c0a7efb6375dc7718ac 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)",