rebase -i: fix overzealous output redirection
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Thu, 26 Jul 2007 06:35:51 +0000 (07:35 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Jul 2007 06:38:43 +0000 (23:38 -0700)
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 <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--interactive.sh

index 93289c0..9a88335 100755 (executable)
@@ -250,10 +250,12 @@ do_next () {
                case "$(peek_next_command)" in
                squash)
                        EDIT_COMMIT=
                case "$(peek_next_command)" in
                squash)
                        EDIT_COMMIT=
+                       USE_OUTPUT=output
                        cp "$MSG" "$SQUASH_MSG"
                ;;
                *)
                        EDIT_COMMIT=-e
                        cp "$MSG" "$SQUASH_MSG"
                ;;
                *)
                        EDIT_COMMIT=-e
+                       USE_OUTPUT=
                        test -f "$SQUASH_MSG" && rm "$SQUASH_MSG"
                esac
 
                        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
                        # 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
                        ;;
                t)
                        cp "$MSG" "$GIT_DIR"/MERGE_MSG