summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e6f68a2)
raw | patch | inline | side by side (parent: e6f68a2)
author | Elijah Newren <newren@gmail.com> | |
Sun, 3 Oct 2010 20:00:10 +0000 (14:00 -0600) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 6 Oct 2010 20:26:12 +0000 (13:26 -0700) |
Also, prefix an expected-to-fail git mv command with 'test_must_fail'.
Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7001-mv.sh | patch | blob | history |
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 65a35d94a001b555ce9e4d6c528d588339a5300b..624e6d25de0b978c839714c7abeeec563f3c42d8 100755 (executable)
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
test_expect_success \
'checking -f on untracked file with existing target' \
'touch path0/untracked1 &&
- git mv -f untracked1 path0
+ test_must_fail git mv -f untracked1 path0 &&
test ! -f .git/index.lock &&
test -f untracked1 &&
test -f path0/untracked1'