undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-mv: special case destination "."

Browse Source 
Since the normalized basename of "." is "", the check for directory
failed erroneously.

Noticed by Fredrik Kuivinen.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Johannes Schindelin 2006-08-18 12:42:39 +02:00 committed by Junio C Hamano
parent d78b0f3d6a
commit c5203bdf66
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin-mv.c
View File

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