X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=fast-import.c;h=c2a814ec660862937e495c0a7efb6375dc7718ac;hb=20c8cde45656fc187e06088ef5baf0bbdfdf70bd;hp=eed97c8fa9f3e1624f69443e28f76d995e589b34;hpb=ffb13460cd15c0b90b7adacfbe4448d4d5387f5e;p=~andy%2Fgit

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