summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-07-26 07:35:51 +0100
committerJunio C Hamano <gitster@pobox.com>2007-07-25 23:38:43 -0700
commit91e1ee776283a238cc135fbbfc3f812492bcbd86 (patch)
tree02d10a47330da623a0a4ec3a2475fae509cdde89 /git-rebase--interactive.sh
parentb87841e1645f900fbec0a937a45f98b70b5684ca (diff)
downloadgit-91e1ee776283a238cc135fbbfc3f812492bcbd86.tar.gz
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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
-rwxr-xr-xgit-rebase--interactive.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 93289c050a..9a88335c5f 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