提交 31d87385 编写于 作者: M Markus Heidelberg 提交者: Junio C Hamano

rebase: don't invoke the pager for each commit summary

This regression was introduced by commit 0aa958d4 (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: NMarkus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 3a985c27
...@@ -86,7 +86,7 @@ continue_merge () { ...@@ -86,7 +86,7 @@ continue_merge () {
fi fi
fi fi
test -z "$GIT_QUIET" && 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` prev_head=`git rev-parse HEAD^0`
# save the resulting commit so we can read-tree on it later # save the resulting commit so we can read-tree on it later
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册