On Mon, May 28, 2018 at 06:25:18PM +0900, Junio C Hamano 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.
Heh, that is one of the cases that I found most ugly when I looked into this earlier (and in particular, because I think it makes cut-and-paste a little harder). More discussion in: https://public-inbox.org/git/20170111140758.yyfsc3r3spqpi...@sigill.intra.peff.net/ and down-thread. -Peff
