[PATCH] rebase -i: fix overzealous output redirection

[PATCH] rebase -i: fix overzealous output redirection

[Johannes Schindelin]

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>
---
	This bit me real hard when cleaning up the work-tree patch
	series.

 git-rebase--interactive.sh |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 93289c0..9a88335 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
-- 
1.5.3.rc2.42.gda8d-dirty

Re: [PATCH] rebase -i: fix overzealous output redirection

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> 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>
> ---
> 	This bit me real hard when cleaning up the work-tree patch
> 	series.

Heh, good catch.

At least you are eating your own dog food, which is a very
assuring thing before the feature release.  Thanks.

Re: [PATCH] rebase -i: fix overzealous output redirection

[Johannes Schindelin]

Hi,

On Wed, 25 Jul 2007, Junio C Hamano wrote:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > 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>
> > ---
> > 	This bit me real hard when cleaning up the work-tree patch
> > 	series.
> 
> Heh, good catch.
> 
> At least you are eating your own dog food, which is a very
> assuring thing before the feature release.  Thanks.

I try my very best!  Though I have to go to bed without having had a 
chance to work on the send-pack bug :-(

Good night, and good luck,
Dscho