Merge branch 'js/maint-am-rebase-invalid-author'

* js/maint-am-rebase-invalid-author:
  am: use get_author_ident_from_commit instead of mailinfo when rebasing

diff --cc git-am.sh
index ef2d51a2b80d77dc5fe28d76b5047a97dc4c0fae,abcb05b6baa8693fa6af021905b17a72d4f408e3..e7f008c7baae2ff484e16882e199b6b9d75195aa
--- 1/git-am.sh
--- 2/git-am.sh
+++ b/git-am.sh
@@@ -592,11 -591,9 +592,11 @@@ d
  
                test -s "$dotest/patch" || {
                        echo "Patch is empty.  Was it split wrong?"
 +                      echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
 +                      echo "To restore the original branch and stop patching run \"$cmdline --abort\"."
                        stop_here $this
                }
-               rm -f "$dotest/original-commit"
+               rm -f "$dotest/original-commit" "$dotest/author-script"
                if test -f "$dotest/rebasing" &&
                        commit=$(sed -e 's/^From \([0-9a-f]*\) .*/\1/' \
                                -e q "$dotest/$msgnum") &&

diff --cc t/t3400-rebase.sh
Simple merge