Merge branch 'ds/commit-graph-lockfile-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 4 Sep 2018 21:31:39 +0000 (14:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 Sep 2018 21:31:39 +0000 (14:31 -0700)
commit0a866db570e520ce7b08d1eceefdeaa9d63b6704
tree169b44dbc5ad90d9d1d209e552fb59ec17a45c23
parentca676b9bd354e846ac207e7879760719826517ce
parent091f4cf3586957c3fd99d4c4c59c569d009137ad
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
commit.c