{"thread":{"id":"21256","subject":"[PATCH] rebase -i: fix reword when using a terminal editor","startedAt":"2009-10-16T06:32:33Z","lastAt":"2009-10-19T08:05:46Z","messageCount":3,"participants":["Stephen Boyd","Björn Gustavsson","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"125142","messageId":"1255674753-13949-1-git-send-email-bebarino@gmail.com","threadId":"21256","inReplyTo":null,"subject":"[PATCH] rebase -i: fix reword when using a terminal editor","fromName":"Stephen Boyd","fromEmail":"bebarino@gmail.com","sentAt":"2009-10-16T06:32:33Z","receivedAt":"2009-10-16T06:32:33Z","isPatch":true,"sender":{"key":"bebarino@gmail.com","avatar":"https://avatars.githubusercontent.com/u/38832?v=4"},"body":"We don't want to use output() on git-commit --amend when rewording the\ncommit message. This leads to confusion as the editor is run in a\nsubshell with it's output saved away, leaving the user with a seemingly\nfrozen terminal.\n\nFix by removing the output part.\n\nSigned-off-by: Stephen Boyd <bebarino@gmail.com>\n---\n\nOn top of next.\n\nI think this is right, although I'm not really experienced in the rebase -i\ncode\n\n git-rebase--interactive.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex a43ee22..a1879e3 100755\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -346,7 +346,7 @@ do_next () {\n \t\tmark_action_done\n \t\tpick_one $sha1 ||\n \t\t\tdie_with_patch $sha1 \"Could not apply $sha1... $rest\"\n-\t\toutput git commit --amend\n+\t\tgit commit --amend\n \t\t;;\n \tedit|e)\n \t\tcomment_for_reflog edit\n-- \n1.6.5.103.g6b436.dirty\n"},{"id":"125144","messageId":"6672d0160910160105t33ea0585r5c791d47d03f40a9@mail.gmail.com","threadId":"21256","inReplyTo":"1255674753-13949-1-git-send-email-bebarino@gmail.com","subject":"Re: [PATCH] rebase -i: fix reword when using a terminal editor","fromName":"Björn Gustavsson","fromEmail":"bgustavsson@gmail.com","sentAt":"2009-10-16T08:05:39Z","receivedAt":"2009-10-16T08:05:39Z","isPatch":true,"sender":{"key":"bgustavsson@gmail.com","avatar":"https://avatars.githubusercontent.com/u/74840?v=4"},"body":"2009/10/16 Stephen Boyd <bebarino@gmail.com>:\n> We don't want to use output() on git-commit --amend when rewording the\n> commit message. This leads to confusion as the editor is run in a\n> subshell with it's output saved away, leaving the user with a seemingly\n> frozen terminal.\n>\n> Fix by removing the output part.\n>\n> Signed-off-by: Stephen Boyd <bebarino@gmail.com>\n> ---\n>\n> On top of next.\n>\n> I think this is right, although I'm not really experienced in the rebase -i\n> code\n\nThanks!\n\nYes, it seems right to me too after a more thorough reading of the\nexisting rebase -i code. It seems that 'output' is only used for\nnon-interactive commands.\n\nI never noticed the problem because I use 'emacsclient' as my\ncommit editor. I didn't think of testing with an editor that run in\nthe terminal window.\n\n/Björn\n-- \nBjörn Gustavsson, Erlang/OTP, Ericsson AB\n"},{"id":"125354","messageId":"7v4opv6c6d.fsf@alter.siamese.dyndns.org","threadId":"21256","inReplyTo":"1255674753-13949-1-git-send-email-bebarino@gmail.com","subject":"Re: [PATCH] rebase -i: fix reword when using a terminal editor","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-10-19T08:05:46Z","receivedAt":"2009-10-19T08:05:46Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks, applied.\n"}]}