From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun, 10 Aug 2014 02:29:32 +0000 (+0700)
Subject: mv: remove an "if" that's always true
X-Git-Tag: v2.2.0-rc0~140^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/42de4b169c5de9d3f22eb1f988aa5b69447951b2?ds=inline;hp=-c

mv: remove an "if" that's always true

This is inside an "else" block of "if (last - first < 1)", so we know
that "last - first >= 1" when we come here. No need to check
"last - first > 0".

While at there, save "argc + last - first" to a variable to shorten
the statements a bit.

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

42de4b169c5de9d3f22eb1f988aa5b69447951b2
diff --git a/builtin/mv.c b/builtin/mv.c
index 5a8ff00047..3b19ca26b2 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -176,22 +176,14 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 				if (last - first < 1)
 					bad = _("source directory is empty");
 				else {
-					int j, dst_len;
+					int j, dst_len, n;
 
-					if (last - first > 0) {
-						source = xrealloc(source,
-								(argc + last - first)
-								* sizeof(char *));
-						destination = xrealloc(destination,
-								(argc + last - first)
-								* sizeof(char *));
-						modes = xrealloc(modes,
-								(argc + last - first)
-								* sizeof(enum update_mode));
-						submodule_gitfile = xrealloc(submodule_gitfile,
-								(argc + last - first)
-								* sizeof(char *));
-					}
+					n = argc + last - first;
+					source = xrealloc(source, n * sizeof(char *));
+					destination = xrealloc(destination, n * sizeof(char *));
+					modes = xrealloc(modes, n * sizeof(enum update_mode));
+					submodule_gitfile =
+						xrealloc(submodule_gitfile, n * sizeof(char *));
 
 					dst = add_slash(dst);
 					dst_len = strlen(dst);