From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 27 Jun 2010 19:07:44 +0000 (-0700)
Subject: Merge branch 'js/maint-am-rebase-invalid-author'
X-Git-Tag: v1.7.2-rc0~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bcdfb20ae94138eac863b4c40263dc10f29917e5;p=git.git

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
---

bcdfb20ae94138eac863b4c40263dc10f29917e5
diff --cc git-am.sh
index ef2d51a2b,abcb05b6b..e7f008c7b
--- a/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") &&