From: Stephen Boyd <bebarino@gmail.com>
Date: Fri, 16 Oct 2009 06:32:33 +0000 (-0700)
Subject: rebase -i: fix reword when using a terminal editor
X-Git-Tag: v1.6.6-rc0~110^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7725cb5e8bfd27887ee0b984b83708eff655ec9e;p=git.git

rebase -i: fix reword when using a terminal editor

We don't want to use output() on git-commit --amend when rewording the
commit message. This leads to confusion as the editor is run in a
subshell with it's output saved away, leaving the user with a seemingly
frozen terminal.

Fix by removing the output part.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index a43ee22c6..a1879e3ac 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -346,7 +346,7 @@ do_next () {
 		mark_action_done
 		pick_one $sha1 ||
 			die_with_patch $sha1 "Could not apply $sha1... $rest"
-		output git commit --amend
+		git commit --amend
 		;;
 	edit|e)
 		comment_for_reflog edit