diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-29 19:38:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 19:38:17 (GMT) |
| commit | 9c65991abd7c954be8c3a1414f6cf365b83ee317 (patch) | |
| tree | c1b9516750692954a948cc7beafdea1088b00378 /t | |
| parent | 2f72ebfcd02b06a19e6c5429fcfc78b5fc754144 (diff) | |
| parent | b2b1f615ce3b9383a32dec7f84488284004224f3 (diff) | |
| download | git-9c65991abd7c954be8c3a1414f6cf365b83ee317.zip git-9c65991abd7c954be8c3a1414f6cf365b83ee317.tar.gz git-9c65991abd7c954be8c3a1414f6cf365b83ee317.tar.bz2 | |
Merge branch 'jc/denoise-rm-to-resolve' into maint
"git rm" to resolve a conflicted path leaked an internal message
"needs merge" before actually removing the path, which was
confusing. This has been corrected.
* jc/denoise-rm-to-resolve:
rm: resolving by removal is not a warning-worthy event
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3600-rm.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 85ae7dc..66282a7 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -252,6 +252,19 @@ test_expect_success 'choking "git rm" should not let it die with cruft' ' test_path_is_missing .git/index.lock ' +test_expect_success 'Resolving by removal is not a warning-worthy event' ' + git reset -q --hard && + test_when_finished "rm -f .git/index.lock msg && git reset -q --hard" && + blob=$(echo blob | git hash-object -w --stdin) && + for stage in 1 2 3 + do + echo "100644 $blob $stage blob" + done | git update-index --index-info && + git rm blob >msg 2>&1 && + test_i18ngrep ! "needs merge" msg && + test_must_fail git ls-files -s --error-unmatch blob +' + test_expect_success 'rm removes subdirectories recursively' ' mkdir -p dir/subdir/subsubdir && echo content >dir/subdir/subsubdir/file && |