development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ds/commit-graph-lockfile-fix'

Browse source 
"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
This commit is contained in:
Junio C Hamano 2018-09-04 14:31:39 -07:00
parent ca676b9bd3 091f4cf358
commit 0a866db570
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
commit.c
View file

@ -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));