{"thread":{"id":"48828","subject":"[PATCH] git-rebase--{interactive,preserve-merges}: fix formatting of todo help message","startedAt":"2018-07-04T12:25:57Z","lastAt":"2018-07-06T18:30:36Z","messageCount":5,"participants":["Tobias Klauser","Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"351690","messageId":"1530706658-20519-1-git-send-email-tklauser@distanz.ch","threadId":"48828","inReplyTo":null,"subject":"[PATCH] git-rebase--{interactive,preserve-merges}: fix formatting of todo help message","fromName":"Tobias Klauser","fromEmail":"tklauser@distanz.ch","sentAt":"2018-07-04T12:17:38Z","receivedAt":"2018-07-04T12:25:57Z","isPatch":true,"sender":{"key":"tklauser@distanz.ch","avatar":"https://avatars.githubusercontent.com/u/539708?v=4"},"body":"Part of the todo help message in git-rebase--interactive.sh and\ngit-rebase--preserve-merges.sh is unnecessarily indented, making the\nmessage look weird:\n\n  # These lines can be re-ordered; they are executed from top to bottom.\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  #\n  # Note that empty commits are commented out\n\nRemove the extra lines and trailing indent to make it look as follows:\n\n  # These lines can be re-ordered; they are executed from top to bottom.\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\nSigned-off-by: Tobias Klauser <tklauser@distanz.ch>\n---\n git-rebase--interactive.sh     | 4 ++--\n git-rebase--preserve-merges.sh | 4 ++--\n 2 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex 299ded21375e..a31af6d4c419 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\ndiff --git a/git-rebase--preserve-merges.sh b/git-rebase--preserve-merges.sh\nindex c51c7828e7b3..c214c5e4d6ce 100644\n--- a/git-rebase--preserve-merges.sh\n+++ b/git-rebase--preserve-merges.sh\n@@ -891,9 +891,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.130.g98da2f6b3e4a\n\n"},{"id":"351691","messageId":"nycvar.QRO.7.76.6.1807041505000.75@tvgsbejvaqbjf.bet","threadId":"48828","inReplyTo":"1530706658-20519-1-git-send-email-tklauser@distanz.ch","subject":"Re: [PATCH] git-rebase--{interactive,preserve-merges}: fix formatting of todo help message","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-07-04T13:09:34Z","receivedAt":"2018-07-04T13:10:03Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Tobias,\n\nOn Wed, 4 Jul 2018, Tobias Klauser wrote:\n\n> Part of the todo help message in git-rebase--interactive.sh and\n> git-rebase--preserve-merges.sh is unnecessarily indented, making the\n> message look weird:\n> \n>   # These lines can be re-ordered; they are executed from top to bottom.\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>   #\n>   # Note that empty commits are commented out\n> \n> Remove the extra lines and trailing indent to make it look as follows:\n> \n>   # These lines can be re-ordered; they are executed from top to bottom.\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> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>\n\nThank you for this contribution!\n\nFunnily enough, the same fix had been provided here:\nhttps://public-inbox.org/git/614F0C12-7173-48BD-9212-71AD6FBBDAA7@dana.is/\nalthough only for `git-rebase--interactive.sh`.\n\nIn that thread, we agreed that it overlaps too much with a GSoC project,\nand that that project already addresses the same problem by way of\nrewriting that part in C (and therefore we decided it would be better to\ngo with those patches).\n\nHowever, your patch also covers this:\n\n>  git-rebase--preserve-merges.sh | 4 ++--\n\nI completely missed that in the earlier patch.\n\nJunio, this gets an ACK from me, could you apply the\n`git-rebase--preserve-merges.sh` part selectively, please?\n\nCiao,\nJohannes\n"},{"id":"351692","messageId":"20180704141635.GH24016@distanz.ch","threadId":"48828","inReplyTo":"nycvar.QRO.7.76.6.1807041505000.75@tvgsbejvaqbjf.bet","subject":"Re: [PATCH] git-rebase--{interactive,preserve-merges}: fix formatting of todo help message","fromName":"Tobias Klauser","fromEmail":"tklauser@distanz.ch","sentAt":"2018-07-04T14:16:35Z","receivedAt":"2018-07-04T14:16:40Z","isPatch":true,"sender":{"key":"tklauser@distanz.ch","avatar":"https://avatars.githubusercontent.com/u/539708?v=4"},"body":"Hi Johannes\n\nThanks for your detailed answer.\n\nOn 2018-07-04 at 15:09:34 +0200, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:\n> On Wed, 4 Jul 2018, Tobias Klauser wrote:\n> \n> > Part of the todo help message in git-rebase--interactive.sh and\n> > git-rebase--preserve-merges.sh is unnecessarily indented, making the\n> > message look weird:\n> > \n> >   # These lines can be re-ordered; they are executed from top to bottom.\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> >   #\n> >   # Note that empty commits are commented out\n> > \n> > Remove the extra lines and trailing indent to make it look as follows:\n> > \n> >   # These lines can be re-ordered; they are executed from top to bottom.\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> > Signed-off-by: Tobias Klauser <tklauser@distanz.ch>\n> \n> Thank you for this contribution!\n> \n> Funnily enough, the same fix had been provided here:\n> https://public-inbox.org/git/614F0C12-7173-48BD-9212-71AD6FBBDAA7@dana.is/\n> although only for `git-rebase--interactive.sh`.\n> \n> In that thread, we agreed that it overlaps too much with a GSoC project,\n> and that that project already addresses the same problem by way of\n> rewriting that part in C (and therefore we decided it would be better to\n> go with those patches).\n\nUnfortunately I don't follow git development that closely anymore, so I\nwasn't aware of the previous patch and the discussion. Sorry about the\nduplication/conflict.\n\nAnd I'm glad to see that this part will be rewritten in C :-)\n\n> However, your patch also covers this:\n> \n> >  git-rebase--preserve-merges.sh | 4 ++--\n> \n> I completely missed that in the earlier patch.\n> \n> Junio, this gets an ACK from me, could you apply the\n> `git-rebase--preserve-merges.sh` part selectively, please?\n\nLet me know if I should provide an updated patch just for\ngit-rebase--preserve-merges.sh\n\nThanks\nTobias\n"},{"id":"351700","messageId":"nycvar.QRO.7.76.6.1807042131460.75@tvgsbejvaqbjf.bet","threadId":"48828","inReplyTo":"20180704141635.GH24016@distanz.ch","subject":"Re: [PATCH] git-rebase--{interactive,preserve-merges}: fix formatting of todo help message","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-07-04T19:32:46Z","receivedAt":"2018-07-04T19:33:14Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Tobias,\n\nOn Wed, 4 Jul 2018, Tobias Klauser wrote:\n\n> On 2018-07-04 at 15:09:34 +0200, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:\n>\n> > Junio, this gets an ACK from me, could you apply the\n> > `git-rebase--preserve-merges.sh` part selectively, please?\n> \n> Let me know if I should provide an updated patch just for\n> git-rebase--preserve-merges.sh\n\nI think we'll have to wait for tomorrow to get an answer to this; today is\na holiday in the States.\n\nCiao,\nJohannes\n"},{"id":"351790","messageId":"xmqqh8lckyih.fsf@gitster-ct.c.googlers.com","threadId":"48828","inReplyTo":"20180704141635.GH24016@distanz.ch","subject":"Re: [PATCH] git-rebase--{interactive,preserve-merges}: fix formatting of todo help message","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-07-06T18:30:30Z","receivedAt":"2018-07-06T18:30:36Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Tobias Klauser <tklauser@distanz.ch> writes:\n\n> And I'm glad to see that this part will be rewritten in C :-)\n>\n>> However, your patch also covers this:\n>> \n>> >  git-rebase--preserve-merges.sh | 4 ++--\n>> \n>> I completely missed that in the earlier patch.\n>> \n>> Junio, this gets an ACK from me, could you apply the\n>> `git-rebase--preserve-merges.sh` part selectively, please?\n\nHere is what I assembled from various pieces in the list archive.\n\n-- >8 --\nSubject: [PATCH] git-rebase--preserve-merges: fix formatting of todo help message\n\nPart of the todo help message in git-rebase--preserve-merges.sh is\nunnecessarily indented, making the message look weird.  Remove the\nextra lines and trailing indent.\n\nThis was a minor regression introduced by d48f97aa (\"rebase:\nreindent function git_rebase__interactive\", 2018-03-23) in the 2.18\ntimeframe.  The same issue exists in \"rebase -i\", but it is being\naddressed separately as part of the rewrite of the subcommand into C.\n\nSigned-off-by: Tobias Klauser <tklauser@distanz.ch>\nReviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n\n git-rebase--preserve-merges.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-rebase--preserve-merges.sh b/git-rebase--preserve-merges.sh\nindex c51c7828e7..c214c5e4d6 100644\n--- a/git-rebase--preserve-merges.sh\n+++ b/git-rebase--preserve-merges.sh\n@@ -891,9 +891,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"}]}