Skip to content

Commit

Permalink
add test cases for "git mv -k"
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael J Gruber authored and Junio C Hamano committed Jan 14, 2009
1 parent 3d1d81e commit 3772923
Showing 1 changed file with 25 additions and 0 deletions.
25 changes: 25 additions & 0 deletions t/t7001-mv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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_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 &&
Expand Down

0 comments on commit 3772923

Please sign in to comment.