Commit d2c2d78192e0bcd012717d912831c878081bf2f8

Stefan Sperling 2018-11-18T21:46:12

fix comparison of parents content in advance_branch()

1
2
3
4
5
6
7
8
9
10
11
12
13
diff --git a/lib/commit_graph.c b/lib/commit_graph.c
index f1b2429..be53a12 100644
--- a/lib/commit_graph.c
+++ b/lib/commit_graph.c
@@ -322,7 +322,7 @@ advance_branch(struct got_commit_graph *graph,
 
 			if (prev_id) {
 				if (!branches_differ &&
-				    got_object_id_cmp(merged_id, prev_id) != 0)
+				    got_object_id_cmp(id, prev_id) != 0)
 					branches_differ = 1;
 				free(prev_id);
 			}