@matheusbsbs / matheus-bagliano / commits / 91e1ee7762
Fork 0

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>

Johannes Schindelin committed Jul 26, 2007 at 07:35 UTC 91e1ee776283a238cc135fbbfc3f812492bcbd86
1 file changed +3 -1
git-rebase--interactive.sh
+3 -1
@@ -250,10 +250,12 @@ do_next () {
250 case "$(peek_next_command)" in
251 squash)
252 EDIT_COMMIT=
253 + USE_OUTPUT=output
254 cp "$MSG" "$SQUASH_MSG"
255 ;;
256 *)
257 EDIT_COMMIT=-e
258 + USE_OUTPUT=
259 test -f "$SQUASH_MSG" && rm "$SQUASH_MSG"
260 esac
261
@@ -267,7 +269,7 @@ do_next () {
269 # This is like --amend, but with a different message
270 eval "$author_script"
271 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
270 - output git commit -F "$MSG" $EDIT_COMMIT
272 + $USE_OUTPUT git commit -F "$MSG" $EDIT_COMMIT
273 ;;
274 t)
275 cp "$MSG" "$GIT_DIR"/MERGE_MSG