Commit Diff

Commit:
28dfdaf275fe68efe88c33a705735910223bd21f
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
use a topological commit graph for the ancestry check in 'got send' Fixes spurious "branch on server has a different ancestry" errors from 'got send' when the repository history contains merge commits.
Actions:
Patch | Tree
commit - c256bb30533620d9a40360677d71dd1de453d38a
commit + 28dfdaf275fe68efe88c33a705735910223bd21f
blob - aaa2ee3425a37c62a31c5102a09161c8bad73430
blob + 3ac9e756473d9c9ce8acb2d432b106355cda9bfd
--- lib/send.c
+++ lib/send.c
@@ -222,7 +222,7 @@ check_common_ancestry(const char *refname, struct got_
 		    "bad object type on server for %s", refname);
 
 	err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
-	    my_id, their_id, 0, 0, repo, cancel_cb, cancel_arg);
+	    my_id, their_id, 0, 1, repo, cancel_cb, cancel_arg);
 	if (err)
 		return err;
 	if (yca_id == NULL)