On Mon, May 28, 2018 at 11:25 AM, Junio C Hamano <gits...@pobox.com> wrote: > Martin Ågren <martin.ag...@gmail.com> writes: > >> diff --git a/t/t1011-read-tree-sparse-checkout.sh >> b/t/t1011-read-tree-sparse-checkout.sh >> index 0c6f48f302..31b0702e6c 100755 >> --- a/t/t1011-read-tree-sparse-checkout.sh >> +++ b/t/t1011-read-tree-sparse-checkout.sh >> @@ -243,9 +243,9 @@ test_expect_success 'print errors when failed to update >> worktree' ' >> test_must_fail git checkout top 2>actual && >> cat >expected <<\EOF && >> error: The following untracked working tree files would be overwritten by >> checkout: >> - sub/added >> - sub/addedtoo >> -Please move or remove them before you switch branches. >> +error: sub/added >> +error: sub/addedtoo >> +error: Please move or remove them before you switch branches. >> Aborting >> EOF > > This shows the typical effect of this series, which (I subjectively > think) gives us a more pleasant end-user experience.
Also, very subjectively, I'm torn about this. To me, just one "error/warning/fatal" at the start of the first paragraph feels much better. If we have to somehow mark the second paragraph that "this is also part of the error message" then it's probably better to rephrase. -- Duy
