[PATCH 1/9] merge-recursive: remove dead conditional in update_stages()

From

Thomas Rast <tr@thomasrast.ch>

Date

Feb 4, 2014, 22:17 UTC

Message-ID

<37f625c87b3d0fd61988ee9e8e31f4c227093f5e.1391549294.git.tr@thomasrast.ch>

In-Reply-To

<cover.1391549294.git.tr@thomasrast.ch>

From: Thomas Rast <trast@inf.ethz.ch>

Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 merge-recursive.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/merge-recursive.c b/merge-recursive.c
index 8400a8e..c36dc79 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -545,11 +545,9 @@ static int update_stages(const char *path, const struct diff_filespec *o,
 	 * would_lose_untracked).  Instead, reverse the order of the calls
 	 * (executing update_file first and then update_stages).
 	 */
-	int clear = 1;
 	int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_SKIP_DFCHECK;
-	if (clear)
-		if (remove_file_from_cache(path))
-			return -1;
+	if (remove_file_from_cache(path))
+		return -1;
 	if (o)
 		if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options))
 			return -1;

-- 
1.9.rc2.232.gdd31389