{"thread":{"id":"49366","subject":"[PATCH 0/1] git-rebase--interactive.sh: fix trailing spaces on empty $todo","startedAt":"2018-09-18T13:44:26Z","lastAt":"2018-09-20T14:12:52Z","messageCount":3,"participants":["Shulhan","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"358393","messageId":"20180918134412.32766-1-m.shulhan@gmail.com","threadId":"49366","inReplyTo":null,"subject":"[PATCH 0/1] git-rebase--interactive.sh: fix trailing spaces on empty $todo","fromName":"Shulhan","fromEmail":"m.shulhan@gmail.com","sentAt":"2018-09-18T13:44:10Z","receivedAt":"2018-09-18T13:44:26Z","isPatch":true,"sender":{"key":"m.shulhan@gmail.com","avatar":"https://avatars.githubusercontent.com/u/43306?v=4"},"body":"For someone who use editor that display trailing white spaces, issuing\ninteractive rebase will print two empty lines at the end of rebase with the\nlast line contains tab,\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 character \"\\t\" in above example is white space tab.\n\nThe \"make test\" was run succesfully but I can't reproduce/test manually with\nnon-empty $todo (I have no idea how to do it).\n\nShulhan (1):\n  git-rebase--interactive.sh: fix trailing spaces on empty $todo\n\n git-rebase--interactive.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\n-- \n2.19.0.446.g26223adc4\n\n"},{"id":"358394","messageId":"20180918134412.32766-2-m.shulhan@gmail.com","threadId":"49366","inReplyTo":"20180918134412.32766-1-m.shulhan@gmail.com","subject":"[PATCH 1/1] git-rebase--interactive.sh: fix trailing spaces on empty $todo","fromName":"Shulhan","fromEmail":"m.shulhan@gmail.com","sentAt":"2018-09-18T13:44:11Z","receivedAt":"2018-09-18T13:44:41Z","isPatch":true,"sender":{"key":"m.shulhan@gmail.com","avatar":"https://avatars.githubusercontent.com/u/43306?v=4"},"body":"When issuing interactive rebase, git will open a text editor with list\nof commits to rebase and documentation on how to edit it.  At the end\nof documentation it display,\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 \"\\t\" is white space tab.\n\nThis commit remove the empty tab at the last two line.\n---\n git-rebase--interactive.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex 299ded213..0bf9eefad 100644\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -224,7 +224,7 @@ EOF\n \tgettext \"\n \tHowever, 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.19.0.446.g26223adc4\n\n"},{"id":"358511","messageId":"xmqqfty42r6o.fsf@gitster-ct.c.googlers.com","threadId":"49366","inReplyTo":"20180918134412.32766-1-m.shulhan@gmail.com","subject":"Re: [PATCH 0/1] git-rebase--interactive.sh: fix trailing spaces on empty $todo","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-09-20T14:12:47Z","receivedAt":"2018-09-20T14:12:52Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Shulhan <m.shulhan@gmail.com> writes:\n\n> For someone who use editor that display trailing white spaces, issuing\n> interactive rebase will print two empty lines at the end of rebase with the\n> last line contains tab,\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 character \"\\t\" in above example is white space tab.\n>\n> The \"make test\" was run succesfully but I can't reproduce/test manually with\n> non-empty $todo (I have no idea how to do it).\n\nWhile the issue may still be there, I think that the mid-term plan\nfor the release after this cycle is to use the GSoC version of\n\"rebase -i\" that rewrites all the logic that produces the above in\nC, which has been cooking in 'pu', and hopefully we can see it or\nits reroll in 'next' soonish.\n\nSo please see if the issue is there, or if you find other new issues\n(as this is essentially an attempted faithful re-implementation), in\nthe version on 'pu', and report/fix them in there if necessary.\n\nThanks.\n\n> Shulhan (1):\n>   git-rebase--interactive.sh: fix trailing spaces on empty $todo\n>\n>  git-rebase--interactive.sh | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n"}]}