Merge branch 'jc/merge-base' (early part)

diff --git a/fast-import.c b/fast-import.c
index fd3b11757498d504b3954f70c602603d65277440..404d911390bdb4700d0ee0df46bd7849c1890016 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -1308,7 +1308,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)) {
+               if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
                        unlock_ref(lock);
                        warn("Not updating %s"
                                " (new tip %s does not contain %s)",