Merge branch 'tr/notes-display'

[thirdparty/git.git] / git-rebase.sh

diff --git a/git-rebase.sh b/git-rebase.sh
index 417a1a95cda1b997b5d468692e958d73b0468339..e0eb9568f3d12a068d46196d2dc896dde4d35fd3 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -86,10 +86,8 @@ continue_merge () {
                        printf "Already applied: %0${prec}d " $msgnum
                fi
        fi
-       if test -z "$GIT_QUIET"
-       then
-               git rev-list --pretty=oneline -1 "$cmt" | sed -e 's/^[^ ]* //'
-       fi
+       test -z "$GIT_QUIET" &&
+       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
@@ -154,6 +152,7 @@ move_to_original_branch () {
 
 finish_rb_merge () {
        move_to_original_branch
+       git notes copy --for-rewrite=rebase < "$dotest"/rewritten
        if test -x "$GIT_DIR"/hooks/post-rewrite &&
                test -s "$dotest"/rewritten; then
                "$GIT_DIR"/hooks/post-rewrite rebase < "$dotest"/rewritten