diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-04-15 12:38:27 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-04-15 12:38:27 -0700 |
commit | 6dd361d7022a67b9943aaa5492c8a8c6fb9d49d3 (patch) | |
tree | e88466a5bf389f6dae372a90496d3bb1ce236f3e | |
parent | 99e4e04ecdafe9467a0d5bfb2cdaeebb8e103074 (diff) | |
download | git-sb/bisect.tar.gz |
SQUASH???sb/bisect
-rw-r--r-- | bisect.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -412,11 +412,11 @@ static inline int all_parents_are_visited(struct commit *merge) static struct commit *extract_merge_to_queue(struct commit_list **merges) { - assert(merges); - struct commit_list *p, *q; struct commit *found; + assert(merges); + /* find a merge that is ready, i.e. all parents have been computed */ for (q = NULL, p = *merges; p && !all_parents_are_visited(p->item); q = p, p = p->next); |