mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mv: unindent one level for directory move code

Browse Source 
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:34 +07:00 committed by Junio C Hamano
parent e2b6cfa02e
commit b46b15dea0
1 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
builtin/mv.c
View File

@ -171,44 +171,37 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
&& lstat(dst, &st) == 0) && lstat(dst, &st) == 0)
bad = _("cannot move directory over file"); bad = _("cannot move directory over file");
else if (src_is_dir) { else if (src_is_dir) {
int first = cache_name_pos(src, length); int first = cache_name_pos(src, length), last;
if (first >= 0) if (first >= 0)
prepare_move_submodule(src, first, prepare_move_submodule(src, first,
submodule_gitfile + i); submodule_gitfile + i);
else { else if (index_range_of_same_dir(src, length,
int last; &first, &last) < 1)
modes[i] = WORKING_DIRECTORY;
index_range_of_same_dir(src, length, &first, &last);
if (last - first < 1)
bad = _("source directory is empty"); bad = _("source directory is empty");
else { else { /* last - first >= 1 */
int j, dst_len, n; int j, dst_len, n;
modes[i] = WORKING_DIRECTORY;
n = argc + last - first; n = argc + last - first;
source = xrealloc(source, n * sizeof(char *)); source = xrealloc(source, n * sizeof(char *));
destination = xrealloc(destination, n * sizeof(char *)); destination = xrealloc(destination, n * sizeof(char *));
modes = xrealloc(modes, n * sizeof(enum update_mode)); modes = xrealloc(modes, n * sizeof(enum update_mode));
submodule_gitfile = submodule_gitfile = xrealloc(submodule_gitfile, n * sizeof(char *));
xrealloc(submodule_gitfile, n * sizeof(char *));
dst = add_slash(dst); dst = add_slash(dst);
dst_len = strlen(dst); dst_len = strlen(dst);
for (j = 0; j < last - first; j++) { for (j = 0; j < last - first; j++) {
const char *path = const char *path = active_cache[first + j]->name;
active_cache[first + j]->name;
source[argc + j] = path; source[argc + j] = path;
destination[argc + j] = destination[argc + j] =
prefix_path(dst, dst_len, prefix_path(dst, dst_len, path + length + 1);
path + length + 1);
modes[argc + j] = INDEX; modes[argc + j] = INDEX;
submodule_gitfile[argc + j] = NULL; submodule_gitfile[argc + j] = NULL;
} }
argc += last - first; argc += last - first;
} }
}
} else if (cache_name_pos(src, length) < 0) } else if (cache_name_pos(src, length) < 0)
bad = _("not under version control"); bad = _("not under version control");
else if (lstat(dst, &st) == 0 && else if (lstat(dst, &st) == 0 &&