Commit Diff

Commit:
432b52225c2364202e3a4a7ae75333d2750e824d
From:
Stefan Sperling <stsp@stsp.name>
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 - 718078fb3c86e4b594469f7f7d9ccaae50e1ec12
commit + 432b52225c2364202e3a4a7ae75333d2750e824d
blob - b0a5cf8b33408dae6140de910a3ec547a0b06559
blob + 1976fa9212d7b93d58eab0f3844f52e5f8d48f06
--- lib/send.c
+++ lib/send.c
@@ -226,7 +226,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)