On Tue, Oct 1, 2019 at 12:39 PM Elijah Newren <newren@xxxxxxxxx> wrote: > > On Tue, Oct 1, 2019 at 12:35 PM Denton Liu <liu.denton@xxxxxxxxx> wrote: > > > > Hi Elijah, > > > > Sorry for dragging out this thread for so long... > > > > On Tue, Oct 01, 2019 at 11:55:24AM -0700, Elijah Newren wrote: > > > > [...] > > > > > diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh > > > index 192c94eccd..a840919967 100755 > > > --- a/t/t0050-filesystem.sh > > > +++ b/t/t0050-filesystem.sh > > > @@ -131,4 +131,25 @@ $test_unicode 'merge (silent unicode normalization)' ' > > > > I had to change the 25 to a 24 for this to apply cleanly. > > > > > git merge topic > > > ' > > > > > > +test_expect_success CASE_INSENSITIVE_FS 'checkout with no pathspec and a case insensitive fs' ' > > > + git init repo && > > > + ( > > > + cd repo && > > > + > > > + >Gitweb && > > > + git add Gitweb && > > > + git commit -m "add Gitweb" && > > > + > > > + git checkout --orphan todo && > > > + git reset --hard && > > > + mkdir -p gitweb/subdir && > > > + >gitweb/subdir/file && > > > + git add gitweb && > > > + git commit -m "add gitweb/subdir/file" && > > > + > > > + git checkout master > > > + ) > > > +' > > > + > > > test_done > > > > Just wondering, how did you generate this patch? Did you manually edit > > the last patch and resend it or is this a bug in our diff machinery? > > I manually edited because it "was so simple" and of course just > compounded the problem because I didn't fix the count, as you pointed > out. Gah. Thanks for checking. Clearly, I'm bouncing between too > many things this morning, and need to wait until I'm not so distracted > and rushing so I don't mess things up. I'll sound out a v4 in a few > hours when I've cleaned a few other things off my plate. I was going to send out a new version this morning, but it looks like Junio already picked up the patch and fixed it up (the tip of en/clean-nested-with-ignored already has what we want), so I won't resend after all. Thanks Denton, SZEDER, and Junio.
