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

Merge branch 'maint'

Browse Source 
* maint:
  builtin-mv: readability patch
  git-mv: fix off-by-one error
  git-mv: special case destination "."
This commit is contained in:
Junio C Hamano
2006-08-21 14:16:38 -07:00
parent 43134fcb35 60a6bf5f53
commit e866ffdf9b
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin-mv.c
View File

@ -26,7 +26,7 @@ static const char **copy_pathspec(const char *prefix, const char **pathspec,
if (length > 0 && result[i][length - 1] == '/') { if (length > 0 && result[i][length - 1] == '/') {
char *without_slash = xmalloc(length); char *without_slash = xmalloc(length);
memcpy(without_slash, result[i], length - 1); memcpy(without_slash, result[i], length - 1);
without_slash[length] = '\0'; without_slash[length - 1] = '\0';
result[i] = without_slash; result[i] = without_slash;
} }
if (base_name) { if (base_name) {
@ -114,7 +114,10 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
modes = xcalloc(count, sizeof(enum update_mode)); modes = xcalloc(count, sizeof(enum update_mode));
dest_path = copy_pathspec(prefix, argv + argc - 1, 1, 0); dest_path = copy_pathspec(prefix, argv + argc - 1, 1, 0);
if (!lstat(dest_path[0], &st) && if (dest_path[0][0] == '\0')
/* special case: "." was normalized to "" */
destination = copy_pathspec(dest_path[0], argv + i, count, 1);
else if (!lstat(dest_path[0], &st) &&
S_ISDIR(st.st_mode)) { S_ISDIR(st.st_mode)) {
dest_path[0] = add_slash(dest_path[0]); dest_path[0] = add_slash(dest_path[0]);
destination = copy_pathspec(dest_path[0], argv + i, count, 1); destination = copy_pathspec(dest_path[0], argv + i, count, 1);

4
t/t7001-mv.sh
View File

@ -82,4 +82,8 @@ test_expect_failure \
'do not move directory over existing directory' \ 'do not move directory over existing directory' \
'mkdir path0 && mkdir path0/path2 && git-mv path2 path0' 'mkdir path0 && mkdir path0/path2 && git-mv path2 path0'
test_expect_success \
'move into "."' \
'git-mv path1/path2/ .'
test_done test_done