Re: [PATCH v3 0/4] Add regression tests for recent rebase -i fixes

2017-06-26 Thread Phillip Wood
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

Re: [PATCH v3 0/4] Add regression tests for recent rebase -i fixes

2017-06-26 Thread Phillip Wood
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

Re: [PATCH v3 0/4] Add regression tests for recent rebase -i fixes

2017-06-23 Thread Junio C Hamano
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

Re: [PATCH v3 0/4] Add regression tests for recent rebase -i fixes

2017-06-23 Thread Junio C Hamano
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

Re: [PATCH v3 0/4] Add regression tests for recent rebase -i fixes

2017-06-23 Thread Junio C Hamano
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,

Re: [PATCH v3 0/4] Add regression tests for recent rebase -i fixes

2017-06-23 Thread Phillip Wood
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 >>>

Re: [PATCH v3 0/4] Add regression tests for recent rebase -i fixes

2017-06-22 Thread Junio C Hamano
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

Re: [PATCH v3 0/4] Add regression tests for recent rebase -i fixes

2017-06-22 Thread Junio C Hamano
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

[PATCH v3 0/4] Add regression tests for recent rebase -i fixes

2017-06-19 Thread Phillip Wood
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