{"thread":{"id":"48091","subject":"Bug With git rebase -p","startedAt":"2018-03-19T20:45:15Z","lastAt":"2018-03-23T09:39:27Z","messageCount":8,"participants":["Joseph Strauss","Junio C Hamano","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"342250","messageId":"9a1c2c55ff7f412f8830dbdc4bc033bc@EXMBX02B.bhphotovideo.local","threadId":"48091","inReplyTo":null,"subject":"Bug With git rebase -p","fromName":"Joseph Strauss","fromEmail":"josephst@bhphoto.com","sentAt":"2018-03-19T20:23:48Z","receivedAt":"2018-03-19T20:45:15Z","isPatch":false,"sender":{"key":"josephst@bhphoto.com","avatar":null},"body":"I found the following erroneous behavior with \"git rebase -p\".\n\nMy current version is git version 2.16.2.windows.1\n\nI made an example at GitHub, https://github.com/jkstrauss/git-bug/\n\nThere seem to be two problems when rebasing merge commits with git rebase -p :\n 1. All lines of merge commits' messages get collapse into a single line.\n 2. When an asterisk is present in the middle of the line it gets replaced with the file names of the current directory.\n\n \n\n\nJoseph Kalman Strauss\nLifecycle Management Engineer\nB&H Photo\n212-239-7500 x2212\njosephst@bhphoto.com\n"},{"id":"342252","messageId":"xmqqlgenu6qj.fsf@gitster-ct.c.googlers.com","threadId":"48091","inReplyTo":"9a1c2c55ff7f412f8830dbdc4bc033bc@EXMBX02B.bhphotovideo.local","subject":"Re: Bug With git rebase -p","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-03-19T20:53:56Z","receivedAt":"2018-03-19T20:54:09Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Joseph Strauss writes:\n\n> I found the following erroneous behavior with \"git rebase -p\".\n>\n> My current version is git version 2.16.2.windows.1\n>\n> I made an example at GitHub, https://github.com/jkstrauss/git-bug/\n>\n> There seem to be two problems when rebasing merge commits with git rebase -p :\n> 1. All lines of merge commits' messages get collapse into a single line.\n> 2. When an asterisk is present in the middle of the line it gets replaced with the file names of the current directory.\n\nI suspect that this has already been independently discovered\n(twice) and corrected with\n\nhttps://public-inbox.org/git/20180208204241.19324-1-gregory.herrero@oracle.com/\n\nand is included in v2.17-rc0 (and later ;-).\n\n\n"},{"id":"342320","messageId":"nycvar.QRO.7.76.6.1803201551480.55@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz","threadId":"48091","inReplyTo":"xmqqlgenu6qj.fsf@gitster-ct.c.googlers.com","subject":"Re: Bug With git rebase -p","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-03-20T14:52:40Z","receivedAt":"2018-03-20T14:53:08Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 19 Mar 2018, Junio C Hamano wrote:\n\n> Joseph Strauss writes:\n> \n> > I found the following erroneous behavior with \"git rebase -p\".\n> >\n> > My current version is git version 2.16.2.windows.1\n> >\n> > I made an example at GitHub, https://github.com/jkstrauss/git-bug/\n> >\n> > There seem to be two problems when rebasing merge commits with git rebase -p :\n> > 1. All lines of merge commits' messages get collapse into a single line.\n> > 2. When an asterisk is present in the middle of the line it gets replaced with the file names of the current directory.\n> \n> I suspect that this has already been independently discovered\n> (twice) and corrected with\n> \n> https://public-inbox.org/git/20180208204241.19324-1-gregory.herrero@oracle.com/\n> \n> and is included in v2.17-rc0 (and later ;-).\n\nAs it is included in v2.17.0-rc0, Joseph, could you verify that the\nversion at\n\nhttps://github.com/git-for-windows/git/releases/tag/v2.17.0-rc0.windows.1\n\nfixes this issue for you?\n\nThanks,\nJohannes\n"},{"id":"342327","messageId":"44d0049acaf24e409849f929d7ae4888@EXMBX02B.bhphotovideo.local","threadId":"48091","inReplyTo":"nycvar.QRO.7.76.6.1803201551480.55@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz","subject":"RE: Bug With git rebase -p","fromName":"Joseph Strauss","fromEmail":"josephst@bhphoto.com","sentAt":"2018-03-20T15:18:24Z","receivedAt":"2018-03-20T15:55:25Z","isPatch":false,"sender":{"key":"josephst@bhphoto.com","avatar":null},"body":"Perfect. Thank you.\n\n-----Original Message-----\nFrom: Johannes Schindelin [mailto:Johannes.Schindelin@gmx.de] \nSent: Tuesday, March 20, 2018 10:53 AM\nTo: Junio C Hamano \nCc: Joseph Strauss ; git@vger.kernel.org\nSubject: Re: Bug With git rebase -p\n\nHi,\n\nOn Mon, 19 Mar 2018, Junio C Hamano wrote:\n\n> Joseph Strauss writes:\n> \n> > I found the following erroneous behavior with \"git rebase -p\".\n> >\n> > My current version is git version 2.16.2.windows.1\n> >\n> > I made an example at GitHub, https://github.com/jkstrauss/git-bug/\n> >\n> > There seem to be two problems when rebasing merge commits with git rebase -p :\n> > 1. All lines of merge commits' messages get collapse into a single line.\n> > 2. When an asterisk is present in the middle of the line it gets replaced with the file names of the current directory.\n> \n> I suspect that this has already been independently discovered\n> (twice) and corrected with\n> \n> https://public-inbox.org/git/20180208204241.19324-1-gregory.herrero@or\n> acle.com/\n> \n> and is included in v2.17-rc0 (and later ;-).\n\nAs it is included in v2.17.0-rc0, Joseph, could you verify that the version at\n\nhttps://github.com/git-for-windows/git/releases/tag/v2.17.0-rc0.windows.1\n\nfixes this issue for you?\n\nThanks,\nJohannes\n"},{"id":"342478","messageId":"nycvar.QRO.7.76.6.1803212332320.77@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz","threadId":"48091","inReplyTo":"44d0049acaf24e409849f929d7ae4888@EXMBX02B.bhphotovideo.local","subject":"RE: Bug With git rebase -p","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-03-21T22:33:32Z","receivedAt":"2018-03-21T22:34:03Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Joseph,\n\nOn Tue, 20 Mar 2018, Joseph Strauss wrote:\n\n> Perfect. Thank you.\n\nYou are welcome.\n\nI am puzzled, though... does your message mean that you tested the Git for\nWindows v2.17.0-rc0 installer and it did fix your problem? Or do you\nsimply assume that it does fix your problem because Junio & I expect it to\nfix your problem?\n\nCiao,\nJohannes\n"},{"id":"342506","messageId":"xmqqd0zwm5fd.fsf@gitster-ct.c.googlers.com","threadId":"48091","inReplyTo":"nycvar.QRO.7.76.6.1803212332320.77@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz","subject":"Re: Bug With git rebase -p","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-03-22T16:38:30Z","receivedAt":"2018-03-22T16:38:38Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> On Tue, 20 Mar 2018, Joseph Strauss wrote:\n>\n>> Perfect. Thank you.\n>\n> You are welcome.\n>\n> I am puzzled, though... does your message mean that you tested the Git for\n> Windows v2.17.0-rc0 installer and it did fix your problem? Or do you\n> simply assume that it does fix your problem because Junio & I expect it to\n> fix your problem?\n\nThanks for asking, as I was curious about the same thing after\ninterpreting what Joseph said as \"oh, perfect that there is a\npackaged thing I can readily test\" (implying \"I'll get back to you\nafter seeing if it helps\").\n"},{"id":"342510","messageId":"e1f49e12af544f4c9ece2794f7be4d9a@EXMBX02B.bhphotovideo.local","threadId":"48091","inReplyTo":"xmqqd0zwm5fd.fsf@gitster-ct.c.googlers.com","subject":"RE: Bug With git rebase -p","fromName":"Joseph Strauss","fromEmail":"josephst@bhphoto.com","sentAt":"2018-03-22T16:47:32Z","receivedAt":"2018-03-22T16:52:51Z","isPatch":false,"sender":{"key":"josephst@bhphoto.com","avatar":null},"body":"I meant to say that I installed 2.17.0-rc0, and it worked perfectly. Sorry for the ambiguity.\n\n-----Original Message-----\nFrom: Junio C Hamano [mailto:jch2355@gmail.com] On Behalf Of Junio C Hamano\nSent: Thursday, March 22, 2018 12:39 PM\nTo: Johannes Schindelin \nCc: Joseph Strauss ; git@vger.kernel.org\nSubject: Re: Bug With git rebase -p\n\nJohannes Schindelin writes:\n\n> On Tue, 20 Mar 2018, Joseph Strauss wrote:\n>\n>> Perfect. Thank you.\n>\n> You are welcome.\n>\n> I am puzzled, though... does your message mean that you tested the Git \n> for Windows v2.17.0-rc0 installer and it did fix your problem? Or do \n> you simply assume that it does fix your problem because Junio & I \n> expect it to fix your problem?\n\nThanks 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\").\n"},{"id":"342572","messageId":"nycvar.QRO.7.76.6.1803231038560.77@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz","threadId":"48091","inReplyTo":"e1f49e12af544f4c9ece2794f7be4d9a@EXMBX02B.bhphotovideo.local","subject":"RE: Bug With git rebase -p","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-03-23T09:39:15Z","receivedAt":"2018-03-23T09:39:27Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Joseph,\n\nOn Thu, 22 Mar 2018, Joseph Strauss wrote:\n\n> I meant to say that I installed 2.17.0-rc0, and it worked perfectly.\n\nThank you for testing.\n\nCiao,\nJohannes\n"}]}