From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun, 10 Aug 2014 02:29:35 +0000 (+0700)
Subject: mv: combine two if(s)
X-Git-Tag: v2.2.0-rc0~140^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dcadc8b80609f6857ab35163a8a6e08cdaf35b8f

mv: combine two if(s)

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/mv.c b/builtin/mv.c
index 4f324aea1d..e253550551 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -274,10 +274,9 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 	if (gitmodules_modified)
 		stage_updated_gitmodules();
 
-	if (active_cache_changed) {
-		if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
-			die(_("Unable to write new index file"));
-	}
+	if (active_cache_changed &&
+	    write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
+		die(_("Unable to write new index file"));
 
 	return 0;
 }