X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7001-mv.sh;h=8fb3a56838dd476b9b0923f835ce70bd95499f2b;hb=df4364a42981dec067dbacfd6371d4ca910df48e;hp=ef2e78f9df951cfacf5914dfff2a218d2e6f89f7;hpb=0990e7aaaa63ca908dbdfc379af132068e4b066f;p=git.git diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index ef2e78f9d..8fb3a5683 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -55,9 +55,17 @@ test_expect_success \ git mv -k untracked1 untracked2 path0 && test -f untracked1 && test -f untracked2 && - test ! -f path0/untracked1 + test ! -f path0/untracked1 && test ! -f path0/untracked2' +test_expect_success \ + 'checking -f on untracked file with existing target' \ + 'touch path0/untracked1 && + git mv -f untracked1 path0 + test ! -f .git/index.lock && + test -f untracked1 && + test -f path0/untracked1' + # clean up the mess in case bad things happen rm -f idontexist untracked1 untracked2 \ path0/idontexist path0/untracked1 path0/untracked2 \