]> git.ipfire.org Git - thirdparty/git.git/commitdiff
rebase: don't invoke the pager for each commit summary
authorMarkus Heidelberg <markus.heidelberg@web.de>
Sat, 30 Jan 2010 16:23:37 +0000 (17:23 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sat, 30 Jan 2010 16:42:42 +0000 (08:42 -0800)
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>
git-rebase.sh

index b5d9178275d7907e5ed580c1c4bfc9256adcc7ba..fb4fef7b1d6f7abb08fca562ecaad6e36f671768 100755 (executable)
@@ -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