Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Mon Jul 31 04:30:46 2006
This archive was generated by hypermail 2.1.8 : 2006-07-31 04:31:17 EST