Re: [PATCH v3 4/5] rebase -i: support --ignore-date

From: Phillip Wood <phillip.wood123@gmail.com>
Date: May 23, 2020, 18:50 UTC
Message-ID: <0cf07e92-25f2-ae0f-6f44-c2cd9e9f4851@gmail.com>
In-Reply-To: <20200523155203.GA10163@danh.dev>

Hi Danh

On 23/05/2020 16:52, Đoàn Trần Công Danh wrote:

Show 32 quoted lines

> Hi Phillip
> 
> On 2020-05-23 16:43:39+0100, Phillip Wood <phillip.wood123@gmail.com> wrote:
>>> On 2020-05-21 11:14:54+0100, Phillip Wood <phillip.wood123@gmail.com> wrote:
>>>> +# Checking for +0000 in author time is enough since default
>>>> +# timezone is UTC, but the timezone used while committing
>>>> +# sets to +0530.
>>>> +test_expect_success '--ignore-date works with apply backend' '
>>>> +	git commit --amend --date="$GIT_AUTHOR_DATE" &&
>>>> +	git rebase --apply --ignore-date HEAD^ &&
>>>> +	git log -1 --pretty="format:%ai" >authortime &&
>>>
>>> Those --pretty="format:%ai" won't print the newline character in my
>>> test environment.
>>> It looks like it won't print the newline if stdout isn't a tty.
>>>
>>> 	git log -1 --pretty=%ai
>>>
>>> doesn't have that issue.
>>>
>>> I think there're some grep out there considers file doesn't end with
>>> newline as non-text files.
>>
>> Yes it would be better to print the newline, thanks
>>
>> Junio - are you happy to fix this up (assuming there are no other issues) or
>> do you want a re-roll?
> 
> There're 11 invocation of git-log with "--pretty=format",
> in 2/5 and 4/5
> 
> I think it's worth to have a re-roll to avoid mistake.

The part of my reply you've cut said "I've checked the log invocations in the other tests and I think they're all OK." So it is just the one that you pointed out that needs to be fixed up (the others without -1 are all checking the result of rebase --root). I'm happy to re-roll if Junio wants - lets wait and see what he says.

Best Wishes

Phillip Phillip