RE: Bug With git rebase -p

[Johannes Schindelin]

Hi Joseph,

On Thu, 22 Mar 2018, Joseph Strauss wrote:

> I meant to say that I installed 2.17.0-rc0, and it worked perfectly.

Thank you for testing.

Ciao,
Johannes

RE: Bug With git rebase -p

[Joseph Strauss]

I meant to say that I installed 2.17.0-rc0, and it worked perfectly. Sorry for 
the ambiguity.

-Original Message-
From: Junio C Hamano [mailto:jch2...@gmail.com] On Behalf Of Junio C Hamano
Sent: Thursday, March 22, 2018 12:39 PM
To: Johannes Schindelin <johannes.schinde...@gmx.de>
Cc: Joseph Strauss <josep...@bhphoto.com>; git@vger.kernel.org
Subject: Re: Bug With git rebase -p

Johannes Schindelin <johannes.schinde...@gmx.de> writes:

> On Tue, 20 Mar 2018, Joseph Strauss wrote:
>
>> Perfect. Thank you.
>
> You are welcome.
>
> I am puzzled, though... does your message mean that you tested the Git 
> for Windows v2.17.0-rc0 installer and it did fix your problem? Or do 
> you simply assume that it does fix your problem because Junio & I 
> expect it to fix your problem?

Thanks for asking, as I was curious about the same thing after interpreting 
what Joseph said as "oh, perfect that there is a packaged thing I can readily 
test" (implying "I'll get back to you after seeing if it helps").

Re: Bug With git rebase -p

[Junio C Hamano]

Johannes Schindelin  writes:

> On Tue, 20 Mar 2018, Joseph Strauss wrote:
>
>> Perfect. Thank you.
>
> You are welcome.
>
> I am puzzled, though... does your message mean that you tested the Git for
> Windows v2.17.0-rc0 installer and it did fix your problem? Or do you
> simply assume that it does fix your problem because Junio & I expect it to
> fix your problem?

Thanks for asking, as I was curious about the same thing after
interpreting what Joseph said as "oh, perfect that there is a
packaged thing I can readily test" (implying "I'll get back to you
after seeing if it helps").

RE: Bug With git rebase -p

[Johannes Schindelin]

Hi Joseph,

On Tue, 20 Mar 2018, Joseph Strauss wrote:

> Perfect. Thank you.

You are welcome.

I am puzzled, though... does your message mean that you tested the Git for
Windows v2.17.0-rc0 installer and it did fix your problem? Or do you
simply assume that it does fix your problem because Junio & I expect it to
fix your problem?

Ciao,
Johannes

RE: Bug With git rebase -p

[Joseph Strauss]

Perfect. Thank you.

-Original Message-
From: Johannes Schindelin [mailto:johannes.schinde...@gmx.de] 
Sent: Tuesday, March 20, 2018 10:53 AM
To: Junio C Hamano <gits...@pobox.com>
Cc: Joseph Strauss <josep...@bhphoto.com>; git@vger.kernel.org
Subject: Re: Bug With git rebase -p

Hi,

On Mon, 19 Mar 2018, Junio C Hamano wrote:

> Joseph Strauss <josep...@bhphoto.com> writes:
> 
> > I found the following erroneous behavior with "git rebase -p".
> >
> > My current version is git version 2.16.2.windows.1
> >
> > I made an example at GitHub, https://github.com/jkstrauss/git-bug/
> >
> > There seem to be two problems when rebasing merge commits with git rebase 
> > -p :
> >   1. All lines of merge commits' messages get collapse into a single line.
> >   2. When an asterisk is present in the middle of the line it gets replaced 
> > with the file names of the current directory.
> 
> I suspect that this has already been independently discovered
> (twice) and corrected with
> 
> https://public-inbox.org/git/20180208204241.19324-1-gregory.herrero@or
> acle.com/
> 
> and is included in v2.17-rc0 (and later ;-).

As it is included in v2.17.0-rc0, Joseph, could you verify that the version at

https://github.com/git-for-windows/git/releases/tag/v2.17.0-rc0.windows.1

fixes this issue for you?

Thanks,
Johannes

Re: Bug With git rebase -p

[Johannes Schindelin]

Hi,

On Mon, 19 Mar 2018, Junio C Hamano wrote:

> Joseph Strauss  writes:
> 
> > I found the following erroneous behavior with "git rebase -p".
> >
> > My current version is git version 2.16.2.windows.1
> >
> > I made an example at GitHub, https://github.com/jkstrauss/git-bug/
> >
> > There seem to be two problems when rebasing merge commits with git rebase 
> > -p :
> >   1. All lines of merge commits' messages get collapse into a single line.
> >   2. When an asterisk is present in the middle of the line it gets replaced 
> > with the file names of the current directory.
> 
> I suspect that this has already been independently discovered
> (twice) and corrected with
> 
> https://public-inbox.org/git/20180208204241.19324-1-gregory.herr...@oracle.com/
> 
> and is included in v2.17-rc0 (and later ;-).

As it is included in v2.17.0-rc0, Joseph, could you verify that the
version at

https://github.com/git-for-windows/git/releases/tag/v2.17.0-rc0.windows.1

fixes this issue for you?

Thanks,
Johannes

Re: Bug With git rebase -p

[Junio C Hamano]

Joseph Strauss  writes:

> I found the following erroneous behavior with "git rebase -p".
>
> My current version is git version 2.16.2.windows.1
>
> I made an example at GitHub, https://github.com/jkstrauss/git-bug/
>
> There seem to be two problems when rebasing merge commits with git rebase -p :
>   1. All lines of merge commits' messages get collapse into a single line.
>   2. When an asterisk is present in the middle of the line it gets replaced 
> with the file names of the current directory.

I suspect that this has already been independently discovered
(twice) and corrected with

https://public-inbox.org/git/20180208204241.19324-1-gregory.herr...@oracle.com/

and is included in v2.17-rc0 (and later ;-).