From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 4 Sep 2015 02:18:02 +0000 (-0700)
Subject: Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update... 
X-Git-Tag: v2.5.2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=311e5ce2cc06f7bb640be62f487e5b3d14bbb9a0;p=thirdparty%2Fgit.git

Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update' into maint

When re-priming the cache-tree opportunistically while committing
the in-core index as-is, we mistakenly invalidated the in-core
index too aggressively, causing the experimental split-index code
to unnecessarily rewrite the on-disk index file(s).

* dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update:
  commit: don't rewrite shared index unnecessarily
---

311e5ce2cc06f7bb640be62f487e5b3d14bbb9a0