summaryrefslogtreecommitdiff
path: root/t/t7001-mv.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-15 06:34:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-01-15 06:34:05 (GMT)
commit914186a5c3dd687ad157dbda1518a58b58797391 (patch)
tree670daf56dbc9c2b5b54fb0f8946bbf2f6b2a7df4 /t/t7001-mv.sh
parent8dca683346fcd17684eb6646c486461cae38241e (diff)
parentbe17262d13f5f3df5ee9635b11dad180613e9cbd (diff)
downloadgit-914186a5c3dd687ad157dbda1518a58b58797391.zip
git-914186a5c3dd687ad157dbda1518a58b58797391.tar.gz
git-914186a5c3dd687ad157dbda1518a58b58797391.tar.bz2
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0: fix handling of multiple untracked files for git mv -k add test cases for "git mv -k"
Diffstat (limited to 't/t7001-mv.sh')
-rwxr-xr-xt/t7001-mv.sh25
1 files changed, 25 insertions, 0 deletions
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 575ef5b..ef2e78f 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_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 &&
git add path0/README &&