diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-07-30 13:20:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-30 13:20:35 -0700 |
| commit | be2dab9c801fe28a6937e8d426f891e610a82a49 (patch) | |
| tree | 110244fa8330ee5cd0a0ffe30f398a69a83e6aca /t | |
| parent | Merge branch 'bc/push-cas-cquoted-refname' into master (diff) | |
| parent | git-mv: improve error message for conflicted file (diff) | |
| download | tgif-be2dab9c801fe28a6937e8d426f891e610a82a49.tar.xz | |
Merge branch 'ct/mv-unmerged-path-error' into master
"git mv src dst", when src is an unmerged path, errored out
correctly but with an incorrect error message to claim that src is
not tracked, which has been clarified.
* ct/mv-unmerged-path-error:
git-mv: improve error message for conflicted file
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7001-mv.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index 36b50d0b4c..c978b6dee4 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -248,6 +248,23 @@ test_expect_success 'git mv should not change sha1 of moved cache entry' ' rm -f dirty dirty2 +# NB: This test is about the error message +# as well as the failure. +test_expect_success 'git mv error on conflicted file' ' + rm -fr .git && + git init && + >conflict && + test_when_finished "rm -f conflict" && + cfhash=$(git hash-object -w conflict) && + q_to_tab <<-EOF | git update-index --index-info && + 0 $cfhash 0Qconflict + 100644 $cfhash 1Qconflict + EOF + + test_must_fail git mv conflict newname 2>actual && + test_i18ngrep "conflicted" actual +' + test_expect_success 'git mv should overwrite symlink to a file' ' rm -fr .git && |