X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7001-mv.sh;h=ef2e78f9df951cfacf5914dfff2a218d2e6f89f7;hb=5dc1308562ab5991ecada68b06707709bea408c9;hp=575ef5beb2bdd3a0814fb45010ae7889b936f543;hpb=933bb3ae5e6c83288ec7c80c2282984f4927cb48;p=git.git

diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 575ef5beb..ef2e78f9d 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -38,6 +38,31 @@ test_expect_success \
     'git diff-tree -r -M --name-status  HEAD^ HEAD | \
     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_success \
+    '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 "$TEST_DIRECTORY"/../README path0/README &&