summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--commit.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/commit.c b/commit.c
index 1d28677dfb..23db654d64 100644
--- a/commit.c
+++ b/commit.c
@@ -817,6 +817,9 @@ static struct commit_list *paint_down_to_common(struct commit *one, int n,
int i;
uint32_t last_gen = GENERATION_NUMBER_INFINITY;
+ if (!min_generation)
+ queue.compare = compare_commits_by_commit_date;
+
one->object.flags |= PARENT1;
if (!n) {
commit_list_append(one, &result);
@@ -834,7 +837,7 @@ static struct commit_list *paint_down_to_common(struct commit *one, int n,
struct commit_list *parents;
int flags;
- if (commit->generation > last_gen)
+ if (min_generation && commit->generation > last_gen)
BUG("bad generation skip %8x > %8x at %s",
commit->generation, last_gen,
oid_to_hex(&commit->object.oid));