提交 0aa958d4 编写于 作者: S Stephen Boyd 提交者: Junio C Hamano

rebase: replace antiquated sed invocation

Use the modern form of printing a commit subject instead of piping
the output of rev-list to sed.
Signed-off-by: NStephen Boyd <bebarino@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 6fce5157
...@@ -85,10 +85,8 @@ continue_merge () { ...@@ -85,10 +85,8 @@ continue_merge () {
printf "Already applied: %0${prec}d " $msgnum printf "Already applied: %0${prec}d " $msgnum
fi fi
fi fi
if test -z "$GIT_QUIET" test -z "$GIT_QUIET" &&
then git log --format=%s -1 "$cmt"
git rev-list --pretty=oneline -1 "$cmt" | sed -e 's/^[^ ]* //'
fi
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.
先完成此消息的编辑!
想要评论请 注册