From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Apr 2011 21:11:35 +0000 (-0700)
Subject: Merge branch 'en/merge-recursive'
X-Git-Tag: v1.7.6-rc0~137
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ac9666f84;p=git.git

Merge branch 'en/merge-recursive'

* en/merge-recursive:
  merge-recursive: tweak magic band-aid
  merge-recursive: When we detect we can skip an update, actually skip it
  t6022: New test checking for unnecessary updates of files in D/F conflicts
  t6022: New test checking for unnecessary updates of renamed+modified files
---

ac9666f84a597973ef29dc7f0f7edcb3e1a3aa45
diff --cc merge-recursive.c
index af131508e,59482ffc8..7c1267355
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@@ -356,8 -367,16 +357,15 @@@ static void make_room_for_directories_o
  	 */
  	const char *last_file = NULL;
  	int last_len = 0;
 -	struct stage_data *last_e;
  	int i;
  
+ 	/*
+ 	 * Do not do any of this crazyness during the recursive; we don't
+ 	 * even write anything to the working tree!
+ 	 */
+ 	if (o->call_depth)
+ 		return;
+ 
  	for (i = 0; i < entries->nr; i++) {
  		const char *path = entries->items[i].string;
  		int len = strlen(path);