Re: [PATCH v2 4/4] apply: do not touch a file beyond a symbolic link

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Feb 3, 2015, 23:40 UTC
Message-ID: <CAPig+cRw==UoX7-zjykuXZQ43YP3cGKYtGCmc2rkOtV8JeEJGQ@mail.gmail.com>
In-Reply-To: <xmqqy4oepv59.fsf@gitster.dls.corp.google.com>

On Tue, Feb 3, 2015 at 4:01 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 9 quoted lines

> Jeff King <peff@peff.net> writes:
>> diff --git a/t/t4122-apply-symlink-inside.sh b/t/t4122-apply-symlink-inside.sh
>> index 942c5cb..fbba8dd 100755
>> --- a/t/t4122-apply-symlink-inside.sh
>> +++ b/t/t4122-apply-symlink-inside.sh
>> @@ -112,6 +113,20 @@ test_expect_success SYMLINKS 'do not follow symbolic link (same input)' '
>>       test_i18ngrep "beyond a symbolic link" error-ct &&
>>       test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
>>       test_must_fail git ls-files --error-unmatch arch/i386/dir

Broken &&-chain.

Show 12 quoted lines

>> +
>> +     >arch/i386/dir/file &&
>> +     git add arch/i386/dir/file &&
>
> At this point, the target of the patch application has:
>
>         arch/i386/boot/Makefile
>         arch/i386/dir/file
>         arch/x86_64/boot/Makefile
>
> all of which are regular files.  The index and the working tree
> match.