diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-09-01 16:31:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-01 16:31:29 -0700 |
| commit | 81d0e33a225950b3837953572e4ace283341f762 (patch) | |
| tree | edcca9b75eb0ce9fbaace4ebe3c396b9ecdaaf7f /builtin | |
| parent | Merge branch 'rt/remove-hold-lockfile-for-append' (diff) | |
| parent | commit: don't rewrite shared index unnecessarily (diff) | |
| download | tgif-81d0e33a225950b3837953572e4ace283341f762.tar.xz | |
Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update'
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index b37cb6c8b7..63772d016a 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -405,10 +405,8 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix hold_locked_index(&index_lock, 1); refresh_cache_or_die(refresh_flags); if (active_cache_changed - || !cache_tree_fully_valid(active_cache_tree)) { + || !cache_tree_fully_valid(active_cache_tree)) update_main_cache_tree(WRITE_TREE_SILENT); - active_cache_changed = 1; - } if (active_cache_changed) { if (write_locked_index(&the_index, &index_lock, COMMIT_LOCK)) |