development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sm/mv-dry-run-update' into maint

Browse source 
Code clean-up.

* sm/mv-dry-run-update:
  mv: remove unneeded 'if (!show_only)'
  t7001: add test case for --dry-run
This commit is contained in:
Junio C Hamano 2018-03-22 14:24:25 -07:00
parent 342215be59 4cbe92fd41
commit c9bc2c5d4d
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
builtin/mv.c
View file

@ -286,8 +286,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
pos = cache_name_pos(src, strlen(src));
assert(pos >= 0);
if (!show_only)
rename_cache_entry_at(pos, dst);
rename_cache_entry_at(pos, dst);
}
if (gitmodules_modified)

6
t/t7001-mv.sh
View file

@ -38,6 +38,12 @@ test_expect_success \
'git diff-tree -r -M --name-status HEAD^ HEAD | \
grep "^R100..*path1/COPYING..*path0/COPYING"'
test_expect_success \
'mv --dry-run does not move file' \
'git mv -n path0/COPYING MOVED &&
test -f path0/COPYING &&
test ! -f MOVED'
test_expect_success \
'checking -k on non-existing file' \
'git mv -k idontexist path0'