undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase -i: fix overzealous output redirection

Browse Source 
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>
This commit is contained in:
Johannes Schindelin 2007-07-26 07:35:51 +01:00 committed by Junio C Hamano
parent b87841e164
commit 91e1ee7762
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-rebase--interactive.sh
View File

@ -250,10 +250,12 @@ do_next () {
case "$(peek_next_command)" in case "$(peek_next_command)" in
squash) squash)
EDIT_COMMIT= EDIT_COMMIT=
USE_OUTPUT=output
cp "$MSG" "$SQUASH_MSG" cp "$MSG" "$SQUASH_MSG"
;; ;;
*) *)
EDIT_COMMIT=-e EDIT_COMMIT=-e
USE_OUTPUT=
test -f "$SQUASH_MSG" && rm "$SQUASH_MSG" test -f "$SQUASH_MSG" && rm "$SQUASH_MSG"
esac esac
@ -267,7 +269,7 @@ do_next () {
# This is like --amend, but with a different message # This is like --amend, but with a different message
eval "$author_script" eval "$author_script"
export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE 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) t)
cp "$MSG" "$GIT_DIR"/MERGE_MSG cp "$MSG" "$GIT_DIR"/MERGE_MSG