diff options
| author | Elijah Newren <newren@gmail.com> | 2010-10-03 14:00:10 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-06 13:26:12 -0700 |
| commit | a2b1e53b94e99fa88394b1317be478d5c5d864dc (patch) | |
| tree | c52b6b6d0d1c40970c80c0aba5baaeb1e5352cc7 /t/t7001-mv.sh | |
| parent | e6f68a2e746405c1aa72f12a030de1485dff3dab (diff) | |
| download | git-a2b1e53b94e99fa88394b1317be478d5c5d864dc.tar.gz git-a2b1e53b94e99fa88394b1317be478d5c5d864dc.tar.xz | |
t7001 (mv): add missing &&
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>
Diffstat (limited to 't/t7001-mv.sh')
| -rwxr-xr-x | t/t7001-mv.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index 65a35d94a..624e6d25d 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -61,7 +61,7 @@ test_expect_success \ 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' |