mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-28 18:36:46 +02:00
Code

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>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2014-08-10 09:29:32 +07:00 committed by Junio C Hamano
parent 3af05a6d0d
commit 42de4b169c
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
builtin/mv.c
View File

@ -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);