summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-15 12:38:27 -0700
committerJunio C Hamano <gitster@pobox.com>2016-04-15 12:38:27 -0700
commit6dd361d7022a67b9943aaa5492c8a8c6fb9d49d3 (patch)
treee88466a5bf389f6dae372a90496d3bb1ce236f3e
parent99e4e04ecdafe9467a0d5bfb2cdaeebb8e103074 (diff)
downloadgit-sb/bisect.tar.gz
SQUASH???sb/bisect
-rw-r--r--bisect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/bisect.c b/bisect.c
index e583852f27..f7e9cd23f7 100644
--- a/bisect.c
+++ b/bisect.c
@@ -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);