From 91e1ee776283a238cc135fbbfc3f812492bcbd86 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 26 Jul 2007 07:35:51 +0100 Subject: rebase -i: fix overzealous output redirection When squashing, you no longer saw what the editor had to say to you after commit 'Shut "git rebase -i" up when no --verbose was given' (if you used a console based editor, at least). Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- git-rebase--interactive.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'git-rebase--interactive.sh') diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 93289c050..9a88335c5 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -250,10 +250,12 @@ do_next () { case "$(peek_next_command)" in squash) EDIT_COMMIT= + USE_OUTPUT=output cp "$MSG" "$SQUASH_MSG" ;; *) EDIT_COMMIT=-e + USE_OUTPUT= test -f "$SQUASH_MSG" && rm "$SQUASH_MSG" esac @@ -267,7 +269,7 @@ do_next () { # This is like --amend, but with a different message eval "$author_script" export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE - output git commit -F "$MSG" $EDIT_COMMIT + $USE_OUTPUT git commit -F "$MSG" $EDIT_COMMIT ;; t) cp "$MSG" "$GIT_DIR"/MERGE_MSG -- cgit v1.2.1