Integrate version 3 ciabot scripts into contrib/.

[git.git] / git-rebase.sh

diff --git a/git-rebase.sh b/git-rebase.sh
index b5d9178275d7907e5ed580c1c4bfc9256adcc7ba..e0eb9568f3d12a068d46196d2dc896dde4d35fd3 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -79,6 +79,7 @@ continue_merge () {
                then
                        printf "Committed: %0${prec}d " $msgnum
                fi
+               echo "$cmt $(git rev-parse HEAD^0)" >> "$dotest/rewritten"
        else
                if test -z "$GIT_QUIET"
                then
@@ -86,7 +87,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
@@ -151,6 +152,11 @@ 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
+       fi
        rm -r "$dotest"
        say All done.
 }