{"thread":{"id":"5049","subject":"[PATCH 4/3] merge-recur: trivial cleanup","startedAt":"2006-07-30T18:30:09Z","lastAt":"2006-07-30T18:30:09Z","messageCount":1,"participants":["Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"24383","messageId":"Pine.LNX.4.63.0607302029300.29667@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"5049","inReplyTo":null,"subject":"[PATCH 4/3] merge-recur: trivial cleanup","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-07-30T18:30:09Z","receivedAt":"2006-07-30T18:30:09Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n\n\tI should learn to remember...\n\n merge-recursive.c |    9 ++++-----\n 1 files changed, 4 insertions(+), 5 deletions(-)\n\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex 3cdea81..10bce70 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -220,11 +220,10 @@ static int git_merge_trees(int index_onl\n \tstruct object_list *trees = NULL;\n \tstruct unpack_trees_options opts;\n \n-\t/* TODO: if (!cache_dirty) read */\n-\tif (cache_dirty)\n-\t\tflush_cache();\n-\n-\tread_cache_from(getenv(\"GIT_INDEX_FILE\"));\n+\tif (!cache_dirty) {\n+\t\tread_cache_from(getenv(\"GIT_INDEX_FILE\"));\n+\t\tcache_dirty = 1;\n+\t}\n \n \tmemset(&opts, 0, sizeof(opts));\n \tif (index_only)\n-- \n1.4.2.rc2.g6fccc-dirty\n"}]}