Merge branch 'maint'

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 8de5b794bf9f98c80f11166621e122e7830051ac..8568a4fd421d7e60512f0dfc37392bded07419b1 100755 (executable)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -276,9 +276,9 @@ do_next () {
                esac
 
                failed=f
+               author_script=$(get_author_ident_from_commit HEAD)
                output git reset --soft HEAD^
                pick_one -n $sha1 || failed=t
-               author_script=$(get_author_ident_from_commit $sha1)
                echo "$author_script" > "$DOTEST"/author-script
                case $failed in
                f)