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?

(Side note, I _hate_ how bad the feedback for git apply/am is. We should
probably give more information than "error: corrupt patch at line 62"
such as why patches are corrupt (unexpected characters, too many/few
lines, something else?).)

> -- 
> 2.23.0.25.g3f4444bfd7.dirty
> 

Reply via email to