summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Heidelberg <markus.heidelberg@web.de>2010-01-30 16:23:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-30 16:42:42 (GMT)
commit31d87385c4fbd7fc4ab295f2848531b5c1021828 (patch)
tree500b07515610ca2988eb0699c146b42f4d49362c
parent3a985c27fe8bb9ed2fa9580a27c4b4dd7c7192ea (diff)
downloadgit-31d87385c4fbd7fc4ab295f2848531b5c1021828.zip
git-31d87385c4fbd7fc4ab295f2848531b5c1021828.tar.gz
git-31d87385c4fbd7fc4ab295f2848531b5c1021828.tar.bz2
rebase: don't invoke the pager for each commit summary
This regression was introduced by commit 0aa958d (rebase: replace antiquated sed invocation, 2010-01-24), which changed the invocation of "git rev-list | sed" to "git log". It can be reproduced by something like this: $ git rebase -s recursive origin/master Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-rebase.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index b5d9178..fb4fef7 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -86,7 +86,7 @@ continue_merge () {
fi
fi
test -z "$GIT_QUIET" &&
- git log --format=%s -1 "$cmt"
+ GIT_PAGER='' git log --format=%s -1 "$cmt"
prev_head=`git rev-parse HEAD^0`
# save the resulting commit so we can read-tree on it later