commit d2c2d78192e0bcd012717d912831c878081bf2f8 from: Stefan Sperling date: Sun Nov 18 20:46:12 2018 UTC fix comparison of parents content in advance_branch() commit - 6dcdad080328627983a3d6f2234e195d67feff8f commit + d2c2d78192e0bcd012717d912831c878081bf2f8 blob - f1b2429b1df1def03a126f6ab25fd1e1f5d9694b blob + be53a1239bba3e566f78483c4445ede4cf3ec773 --- lib/commit_graph.c +++ 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); }