From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 4 Sep 2018 21:31:39 +0000 (-0700)
Subject: Merge branch 'ds/commit-graph-lockfile-fix'
X-Git-Tag: v2.19.0-rc2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a866db570e520ce7b08d1eceefdeaa9d63b6704;p=thirdparty%2Fgit.git

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
---

0a866db570e520ce7b08d1eceefdeaa9d63b6704