On 23/06/17 20:01, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> For 3420, I can wrap the two-liner patch I showed here earlier into
>> a commit on top of the series.
>
> So, here is what I'll queue on top before merging the topic down to
> 'master'.
Thanks for
On 23/06/17 19:53, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> 3404 needs a similar fix-up for the series to be able to stand on
>> its own. Alternatively, at least we need to understand what in 'pu'
>> makes the result of the merge pass---the symptom indicates that
Junio C Hamano writes:
> For 3420, I can wrap the two-liner patch I showed here earlier into
> a commit on top of the series.
So, here is what I'll queue on top before merging the topic down to
'master'.
-- >8 --
Subject: [PATCH] t3420: fix under GETTEXT_POISON build
Junio C Hamano writes:
> 3404 needs a similar fix-up for the series to be able to stand on
> its own. Alternatively, at least we need to understand what in 'pu'
> makes the result of the merge pass---the symptom indicates that this
> topic cannot be merged to a released
Phillip Wood writes:
> t3404 passes for me,
> $ make GETTEXT_POISON=YesPlease
> $ cd t & t3404-rebase-interactive.sh -i -v
> ...
> # still have 1 known breakage(s)
> # passed all remaining 95 test(s)
> 1..96
Interesting. The tip of 'pu', which includes this series,
On 23/06/17 06:07, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>>> git-rebase.sh | 4 +-
>>> sequencer.c | 11 ++--
>>> t/t3404-rebase-interactive.sh | 7 +++
>>> t/t3420-rebase-autostash.sh | 136
>>>
Junio C Hamano writes:
>> git-rebase.sh | 4 +-
>> sequencer.c | 11 ++--
>> t/t3404-rebase-interactive.sh | 7 +++
>> t/t3420-rebase-autostash.sh | 136
>> --
>> 4 files changed, 147
Phillip Wood writes:
> From: Phillip Wood
>
> I've updated the second two tests to be portable using q_to_cr() as
> Johannes suggested and added his patch to fix the autostash messages
> going to stdout rather than stderr. The reflog
From: Phillip Wood
I've updated the second two tests to be portable using q_to_cr() as
Johannes suggested and added his patch to fix the autostash messages
going to stdout rather than stderr. The reflog message test is
unchanged. Thanks to Johannes for his help and to
9 matches
Mail list logo