diff options
author | Michael J Gruber <git@drmicha.warpmail.net> | 2009-01-14 18:03:21 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-01-14 09:29:24 -0800 |
commit | 3772923f1429f2888074e698c36c071b864effe3 (patch) | |
tree | 7fa5407e441037a590b2a53a77b61f612409595e | |
parent | fast-import: Cleanup mode setting. (diff) | |
download | tgif-3772923f1429f2888074e698c36c071b864effe3.tar.xz |
add test cases for "git mv -k"
Add test cases for ignoring nonexisting and untracked files using the -k
option to "git mv". There is one known breakage related to multiple
untracked files specfied as consecutive arguments.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-x | t/t7001-mv.sh | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index 66bb1264ff..fddcdde6eb 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -39,6 +39,31 @@ test_expect_success \ grep "^R100..*path1/COPYING..*path0/COPYING"' test_expect_success \ + 'checking -k on non-existing file' \ + 'git mv -k idontexist path0' + +test_expect_success \ + 'checking -k on untracked file' \ + 'touch untracked1 && + git mv -k untracked1 path0 && + test -f untracked1 && + test ! -f path0/untracked1' + +test_expect_failure \ + 'checking -k on multiple untracked files' \ + 'touch untracked2 && + git mv -k untracked1 untracked2 path0 && + test -f untracked1 && + test -f untracked2 && + test ! -f path0/untracked1 + test ! -f path0/untracked2' + +# clean up the mess in case bad things happen +rm -f idontexist untracked1 untracked2 \ + path0/idontexist path0/untracked1 path0/untracked2 \ + .git/index.lock + +test_expect_success \ 'adding another file' \ 'cp ../../README path0/README && git add path0/README && |