From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Jan 2020 21:28:25 GMT
Subject: Re: [PATCH 1/3] t6025: modernize style
Message-ID: <xmqqk15pdb7q.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <CAPig+cTW4hATiMYVE7kzcLqK3do9=K8X0nmYjWLOhabgOxZ-XA@mail.gmail.com>

Eric Sunshine <sunshine@sunshineco.com> writes:

>> +       l=$(printf file | git hash-object -t blob -w --stdin) &&
>> +       echo "120000 $l symlink" |
>> +       git update-index --index-info &&
>
> As mentioned[1] in the review of v1, this should be written:
>
>     echo "120000 $l symlink" | git update-index --index-info &&
>
> [1]: https://lore.kernel.org/git/xmqqftgff1r0.fsf@gitster-ct.c.googlers.com/
>
>> +       git commit -m master &&
>> +       git checkout b-symlink &&
>> +       l=$(printf file-different | git hash-object -t blob -w --stdin) &&
>> +       echo "120000 $l symlink" |
>> +       git update-index --index-info &&

Same here.  Funnily, 2/3 improves on this, but I agree that we
should get it right from the get-go.

>> +       git commit -m b-symlink &&
>> +       git checkout b-file &&
>> +       echo plain-file >symlink &&
>> +       git add symlink &&
>> +       git commit -m b-file
>> +'