Hi Stefan,
On Fri, 20 Apr 2018, Stefan Beller wrote:
> > Funny thing is: I tested this with GETTEXT_POISON=1, and it succeeded.
>
> I actually wanted to review the code leading to this commit, and to find
> where to start reviewing I had 'git grep "This is a combination of"' which
> lead me to t
Hi Eric,
On Fri, 20 Apr 2018, Eric Sunshine wrote:
> On Fri, Apr 20, 2018 at 3:29 PM, Eric Sunshine
> wrote:
> > On Fri, Apr 20, 2018 at 8:17 AM, Johannes Schindelin
> > wrote:
> >> + test_must_fail env FAKE_LINES="1 fixup 2 fixup 4" \
> >> + git rebase -i HEAD~4 &&
> >> +
Hi Johannes,
> Funny thing is: I tested this with GETTEXT_POISON=1, and it succeeded.
I actually wanted to review the code leading to this commit, and to find
where to start reviewing I had 'git grep "This is a combination of"' which
lead me to the translation files.
s/grep/test_i18ngrep/ doesn'
Hi Stefan,
On Fri, 20 Apr 2018, Johannes Schindelin wrote:
> A brief test shows, however, that it is not quite as easy as
> s/grep/test_i18ngrep/, something more seems to be broken.
It seems that this week is my Rabbit Hole Week.
Turns out that we have a really, really long-standing bug in our
Hi Stefan,
On Fri, 20 Apr 2018, Stefan Beller wrote:
> On Fri, Apr 20, 2018 at 5:17 AM, Johannes Schindelin
> wrote:
> > When multiple fixup/squash commands are processed and the last one
> > causes merge conflicts and is skipped, we leave the "This is a
> > combination of ..." comments in the c
On Fri, Apr 20, 2018 at 3:29 PM, Eric Sunshine wrote:
> On Fri, Apr 20, 2018 at 8:17 AM, Johannes Schindelin
> wrote:
>> + test_must_fail env FAKE_LINES="1 fixup 2 fixup 4" \
>> + git rebase -i HEAD~4 &&
>> +
>> + : now there is a conflict, and comments in the commit mes
On Fri, Apr 20, 2018 at 8:17 AM, Johannes Schindelin
wrote:
> When multiple fixup/squash commands are processed and the last one
> causes merge conflicts and is skipped, we leave the "This is a
> combination of ..." comments in the commit message.
>
> Signed-off-by: Johannes Schindelin
> ---
> di
On Fri, Apr 20, 2018 at 5:17 AM, Johannes Schindelin
wrote:
> When multiple fixup/squash commands are processed and the last one
> causes merge conflicts and is skipped, we leave the "This is a
> combination of ..." comments in the commit message.
>
> Noticed by Eric Sunshine.
>
> Signed-off-by: J
When multiple fixup/squash commands are processed and the last one
causes merge conflicts and is skipped, we leave the "This is a
combination of ..." comments in the commit message.
Noticed by Eric Sunshine.
Signed-off-by: Johannes Schindelin
---
t/t3418-rebase-continue.sh | 21
9 matches
Mail list logo
