{"thread":{"id":"48783","subject":"[PATCH] rebase -i: Fix white space in comments","startedAt":"2018-06-26T18:02:15Z","lastAt":"2018-06-27T18:51:33Z","messageCount":7,"participants":["dana","Johannes Schindelin","Wink Saville"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"350987","messageId":"614F0C12-7173-48BD-9212-71AD6FBBDAA7@dana.is","threadId":"48783","inReplyTo":null,"subject":"[PATCH] rebase -i: Fix white space in comments","fromName":"dana","fromEmail":"dana@dana.is","sentAt":"2018-06-26T18:02:10Z","receivedAt":"2018-06-26T18:02:15Z","isPatch":true,"sender":{"key":"dana@dana.is","avatar":null},"body":"Fix a trivial white-space issue introduced by commit d48f97aa8\n(\"rebase: reindent function git_rebase__interactive\", 2018-03-23). This\naffected the instructional comments displayed in the editor during an\ninteractive rebase.\n\nSigned-off-by: dana <dana@dana.is>\n---\n\nSorry if i've done any of this wrong; i've never used this work-flow\nbefore. In any case, if it's not immediately obvious, this is the issue\ni mean to fix:\n\nBEFORE (2.17.1):\n\n# If you remove a line here THAT COMMIT WILL BE LOST.\n#\n# However, if you remove everything, the rebase will be aborted.\n#\n# Note that empty commits are commented out\n\nAFTER (2.18.0):\n\n# If you remove a line here THAT COMMIT WILL BE LOST.\n#\n#\tHowever, if you remove everything, the rebase will be aborted.\n#\n#\t\n# Note that empty commits are commented out\n\nThe 2.18.0 version is particularly irritating because many editors\nhighlight the trailing tab in the penultimate line as a white-space\nerror.\n\nAside: It's not a new thing, but i've always felt like that last line\nshould end in a full stop. Maybe i'll send a patch for that too.\n\nCheers,\ndana\n\n git-rebase--interactive.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex 299ded213..a31af6d4c 100644\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -222,9 +222,9 @@ $comment_char $(eval_ngettext \\\n EOF\n \tappend_todo_help\n \tgettext \"\n-\tHowever, if you remove everything, the rebase will be aborted.\n+However, if you remove everything, the rebase will be aborted.\n \n-\t\" | git stripspace --comment-lines >>\"$todo\"\n+\" | git stripspace --comment-lines >>\"$todo\"\n \n \tif test -z \"$keep_empty\"\n \tthen\n-- \n2.18.0\n\n"},{"id":"351029","messageId":"nycvar.QRO.7.76.6.1806262329390.21419@tvgsbejvaqbjf.bet","threadId":"48783","inReplyTo":"614F0C12-7173-48BD-9212-71AD6FBBDAA7@dana.is","subject":"Re: [PATCH] rebase -i: Fix white space in comments","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-06-26T21:30:14Z","receivedAt":"2018-06-26T21:30:20Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Let's Cc: Wink, who authored the commit mentioned as culprit in the commit\nmessage.\n\n\nOn Tue, 26 Jun 2018, dana wrote:\n\n> Fix a trivial white-space issue introduced by commit d48f97aa8\n> (\"rebase: reindent function git_rebase__interactive\", 2018-03-23). This\n> affected the instructional comments displayed in the editor during an\n> interactive rebase.\n> \n> Signed-off-by: dana <dana@dana.is>\n> ---\n> \n> Sorry if i've done any of this wrong; i've never used this work-flow\n> before. In any case, if it's not immediately obvious, this is the issue\n> i mean to fix:\n> \n> BEFORE (2.17.1):\n> \n> # If you remove a line here THAT COMMIT WILL BE LOST.\n> #\n> # However, if you remove everything, the rebase will be aborted.\n> #\n> # Note that empty commits are commented out\n> \n> AFTER (2.18.0):\n> \n> # If you remove a line here THAT COMMIT WILL BE LOST.\n> #\n> #\tHowever, if you remove everything, the rebase will be aborted.\n> #\n> #\t\n> # Note that empty commits are commented out\n> \n> The 2.18.0 version is particularly irritating because many editors\n> highlight the trailing tab in the penultimate line as a white-space\n> error.\n> \n> Aside: It's not a new thing, but i've always felt like that last line\n> should end in a full stop. Maybe i'll send a patch for that too.\n> \n> Cheers,\n> dana\n> \n>  git-rebase--interactive.sh | 4 ++--\n>  1 file changed, 2 insertions(+), 2 deletions(-)\n> \n> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\n> index 299ded213..a31af6d4c 100644\n> --- a/git-rebase--interactive.sh\n> +++ b/git-rebase--interactive.sh\n> @@ -222,9 +222,9 @@ $comment_char $(eval_ngettext \\\n>  EOF\n>  \tappend_todo_help\n>  \tgettext \"\n> -\tHowever, if you remove everything, the rebase will be aborted.\n> +However, if you remove everything, the rebase will be aborted.\n>  \n> -\t\" | git stripspace --comment-lines >>\"$todo\"\n> +\" | git stripspace --comment-lines >>\"$todo\"\n>  \n>  \tif test -z \"$keep_empty\"\n>  \tthen\n> -- \n> 2.18.0\n> \n> \n"},{"id":"351032","messageId":"nycvar.QRO.7.76.6.1806262331340.21419@tvgsbejvaqbjf.bet","threadId":"48783","inReplyTo":"nycvar.QRO.7.76.6.1806262329390.21419@tvgsbejvaqbjf.bet","subject":"Re: [PATCH] rebase -i: Fix white space in comments","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-06-26T21:35:13Z","receivedAt":"2018-06-26T21:35:21Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nand now for the review...\n\nOn Tue, 26 Jun 2018, Johannes Schindelin wrote:\n\n> On Tue, 26 Jun 2018, dana wrote:\n> \n> > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\n> > index 299ded213..a31af6d4c 100644\n> > --- a/git-rebase--interactive.sh\n> > +++ b/git-rebase--interactive.sh\n> > @@ -222,9 +222,9 @@ $comment_char $(eval_ngettext \\\n> >  EOF\n> >  \tappend_todo_help\n> >  \tgettext \"\n> > -\tHowever, if you remove everything, the rebase will be aborted.\n> > +However, if you remove everything, the rebase will be aborted.\n> >  \n> > -\t\" | git stripspace --comment-lines >>\"$todo\"\n> > +\" | git stripspace --comment-lines >>\"$todo\"\n> >  \n> >  \tif test -z \"$keep_empty\"\n> >  \tthen\n\nThis does the job, and I am fine with this way of doing things, and there\nseems to be a lot of precedent doing it this way e.g. in git-bisect.sh.\n\nIf my ACK is welcome, you hereby have it.\n\nCiao,\nJohannes\n"},{"id":"351039","messageId":"nycvar.QRO.7.76.6.1806262343410.21419@tvgsbejvaqbjf.bet","threadId":"48783","inReplyTo":"nycvar.QRO.7.76.6.1806262331340.21419@tvgsbejvaqbjf.bet","subject":"Re: [PATCH] rebase -i: Fix white space in comments","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-06-26T21:44:36Z","receivedAt":"2018-06-26T21:44:42Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi, me again,\n\nOn Tue, 26 Jun 2018, Johannes Schindelin wrote:\n\n> On Tue, 26 Jun 2018, Johannes Schindelin wrote:\n> \n> > On Tue, 26 Jun 2018, dana wrote:\n> > \n> > > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\n> > > index 299ded213..a31af6d4c 100644\n> > > --- a/git-rebase--interactive.sh\n> > > +++ b/git-rebase--interactive.sh\n> > > @@ -222,9 +222,9 @@ $comment_char $(eval_ngettext \\\n> > >  EOF\n> > >  \tappend_todo_help\n> > >  \tgettext \"\n> > > -\tHowever, if you remove everything, the rebase will be aborted.\n> > > +However, if you remove everything, the rebase will be aborted.\n> > >  \n> > > -\t\" | git stripspace --comment-lines >>\"$todo\"\n> > > +\" | git stripspace --comment-lines >>\"$todo\"\n> > >  \n> > >  \tif test -z \"$keep_empty\"\n> > >  \tthen\n> \n> This does the job, and I am fine with this way of doing things, and there\n> seems to be a lot of precedent doing it this way e.g. in git-bisect.sh.\n\nThere is of course one other way to fix this, and that is by rewriting\nthis in C.\n\nWhich Alban has done here ;-)\n\nhttp://public-inbox.org/git/20180626161643.31152-3-alban.gruin@gmail.com\n\nCiao,\nJohannes\n"},{"id":"351044","messageId":"D5941A31-B9B3-4EB1-9D55-D5E86A541D2C@dana.is","threadId":"48783","inReplyTo":"nycvar.QRO.7.76.6.1806262343410.21419@tvgsbejvaqbjf.bet","subject":"Re: [PATCH] rebase -i: Fix white space in comments","fromName":"dana","fromEmail":"dana@dana.is","sentAt":"2018-06-26T21:54:12Z","receivedAt":"2018-06-26T21:54:17Z","isPatch":true,"sender":{"key":"dana@dana.is","avatar":null},"body":"On 26 Jun 2018, at 16:44, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:\n>There is of course one other way to fix this, and that is by rewriting\n>this in C.\n>\n>Which Alban has done here ;-)\n>\n>http://public-inbox.org/git/20180626161643.31152-3-alban.gruin@gmail.com\n\nOh, i'm sorry, i didn't see that. That change does appear to solve the\nsame problem, so i'm happy to defer to it.\n\nThanks for looking!\n\ndana\n\n"},{"id":"351084","messageId":"nycvar.QRO.7.76.6.1806271251130.21419@tvgsbejvaqbjf.bet","threadId":"48783","inReplyTo":"D5941A31-B9B3-4EB1-9D55-D5E86A541D2C@dana.is","subject":"Re: [PATCH] rebase -i: Fix white space in comments","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-06-27T10:52:04Z","receivedAt":"2018-06-27T10:52:11Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Dana,\n\nOn Tue, 26 Jun 2018, dana wrote:\n\n> On 26 Jun 2018, at 16:44, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:\n> >There is of course one other way to fix this, and that is by rewriting\n> >this in C.\n> >\n> >Which Alban has done here ;-)\n> >\n> >http://public-inbox.org/git/20180626161643.31152-3-alban.gruin@gmail.com\n> \n> Oh, i'm sorry, i didn't see that.\n\nNo need to be sorry, nobody expects you to read the \"firehose\" that is the\nGit mailing list in its entirety.\n\n> That change does appear to solve the same problem, so i'm happy to defer\n> to it.\n\nThank you for confirming that it also fixes your issue, that is very\nhelpful!\n\nCiao,\nJohannes\n"},{"id":"351151","messageId":"CAKk8ispLOsfe+t9yMaLdWd9tzN+zBfrXBmt3j-PjF1dYYJbfLg@mail.gmail.com","threadId":"48783","inReplyTo":"nycvar.QRO.7.76.6.1806271251130.21419@tvgsbejvaqbjf.bet","subject":"Re: [PATCH] rebase -i: Fix white space in comments","fromName":"Wink Saville","fromEmail":"wink@saville.com","sentAt":"2018-06-27T18:51:08Z","receivedAt":"2018-06-27T18:51:33Z","isPatch":true,"sender":{"key":"wink@saville.com","avatar":"https://avatars.githubusercontent.com/u/1024284?v=4"},"body":" Sorry for the whitespace bug, it looks like everything is under\ncontrol one way or the other.\n"}]}