diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-09-05 00:31:39 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-09-05 00:31:39 +0300 |
commit | 0a866db570e520ce7b08d1eceefdeaa9d63b6704 (patch) | |
tree | 169b44dbc5ad90d9d1d209e552fb59ec17a45c23 /commit.c | |
parent | ca676b9bd354e846ac207e7879760719826517ce (diff) | |
parent | 091f4cf3586957c3fd99d4c4c59c569d009137ad (diff) |
Merge branch 'ds/commit-graph-lockfile-fix'
"git merge-base" in 2.19-rc1 has performance regression when the
(experimental) commit-graph feature is in use, which has been
mitigated.
* ds/commit-graph-lockfile-fix:
commit: don't use generation numbers if not needed
Diffstat (limited to 'commit.c')
-rw-r--r-- | commit.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -874,6 +874,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); @@ -891,7 +894,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)); |