[PATCH 4/3] merge-recur: trivial cleanup
From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:42:35
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Johannes Schindelin <redacted> --- I should learn to remember... merge-recursive.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 3cdea81..10bce70 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c@@ -220,11 +220,10 @@ static int git_merge_trees(int index_onl struct object_list *trees = NULL; struct unpack_trees_options opts; - /* TODO: if (!cache_dirty) read */ - if (cache_dirty) - flush_cache(); - - read_cache_from(getenv("GIT_INDEX_FILE")); + if (!cache_dirty) { + read_cache_from(getenv("GIT_INDEX_FILE")); + cache_dirty = 1; + } memset(&opts, 0, sizeof(opts)); if (index_only)
--
1.4.2.rc2.g6fccc-dirty