kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'st/mv-lstat-fix' 

Correct use of lstat() that assumed a failing call would not
clobber the statbuf.

* st/mv-lstat-fix:
  mv: handle lstat() failure correctly
maint
Junio C Hamano 2023-08-15 10:19:47 -07:00
parent cecd6a5ffc 72695d8214
commit 8e12aaa7ce
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/mv.c
View File

@ -184,7 +184,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
int src_dir_nr = 0, src_dir_alloc = 0; int src_dir_nr = 0, src_dir_alloc = 0;
struct strbuf a_src_dir = STRBUF_INIT; struct strbuf a_src_dir = STRBUF_INIT;
enum update_mode *modes, dst_mode = 0; enum update_mode *modes, dst_mode = 0;
struct stat st; struct stat st, dest_st;
struct string_list src_for_dst = STRING_LIST_INIT_NODUP; struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
struct lock_file lock_file = LOCK_INIT; struct lock_file lock_file = LOCK_INIT;
struct cache_entry *ce; struct cache_entry *ce;
@ -304,7 +304,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
goto act_on_entry; goto act_on_entry;
} }
if (S_ISDIR(st.st_mode) if (S_ISDIR(st.st_mode)
&& lstat(dst, &st) == 0) { && lstat(dst, &dest_st) == 0) {
bad = _("cannot move directory over file"); bad = _("cannot move directory over file");
goto act_on_entry; goto act_on_entry;
} }

7
t/t7001-mv.sh
View File

@ -174,6 +174,13 @@ test_expect_success 'do not move directory over existing directory' '
test_must_fail git mv path2 path0 test_must_fail git mv path2 path0
' '


test_expect_success 'rename directory to non-existing directory' '
mkdir dir-a &&
>dir-a/f &&
git add dir-a &&
git mv dir-a non-existing-dir
'

test_expect_success 'move into "."' ' test_expect_success 'move into "."' '
git mv path1/path2/ . git mv path1/path2/ .
' '