diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:25 -0700 |
| commit | c9bc2c5d4dd42a2448c63fe097fa8d43222dd5cb (patch) | |
| tree | 4ddfa4fee0414b51ab9ddc0a82a22d36f9ea77ac | |
| parent | 342215be59d3dc4b18db3d4a61fcfe4dc72149b7 (diff) | |
| parent | 4cbe92fd41567e48ca60f4c810479b63ba8421fd (diff) | |
| download | git-c9bc2c5d4dd42a2448c63fe097fa8d43222dd5cb.tar.gz | |
Merge branch 'sm/mv-dry-run-update' into maint
Code clean-up.
* sm/mv-dry-run-update:
mv: remove unneeded 'if (!show_only)'
t7001: add test case for --dry-run
| -rw-r--r-- | builtin/mv.c | 3 | ||||
| -rwxr-xr-x | t/t7001-mv.sh | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/builtin/mv.c b/builtin/mv.c index cf3684d907..8ce6a2ddd4 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -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) diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index 6e5031f56f..d4e6485a26 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -39,6 +39,12 @@ test_expect_success \ 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' |