author | Jay Soffian <jaysoffian@gmail.com> | |
Wed, 16 Jun 2010 07:12:40 +0000 (03:12 -0400) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 16 Jun 2010 17:00:58 +0000 (10:00 -0700) | ||
commit | 43c23251f924db4188cf74361cb7cc3257accce3 | |
tree | ccbd22fa90b8684d728b2984bc6aab042b7f5d6f | tree | snapshot |
parent | e0a9110176e3b17414b1b38fae8febd0791eaa0c | commit | diff |
am: use get_author_ident_from_commit instead of mailinfo when rebasing
In certain situations, commit authorship can consist of an invalid
e-mail address. For example, this is the case when working with git svn
repos where the author email has had the svn repo UUID appended such as:
author@example.com <author@example.com@deadbeef-dead-beef-dead-beefdeadbeef>
Given such an address, mailinfo extracts the authorship incorrectly as
it assumes a valid domain. However, when rebasing the original
authorship should be preserved irrespective of its validity as an email
address.
Using get_author_ident_from_commit instead of mailinfo when rebasing
preserves the original authorship.
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
In certain situations, commit authorship can consist of an invalid
e-mail address. For example, this is the case when working with git svn
repos where the author email has had the svn repo UUID appended such as:
author@example.com <author@example.com@deadbeef-dead-beef-dead-beefdeadbeef>
Given such an address, mailinfo extracts the authorship incorrectly as
it assumes a valid domain. However, when rebasing the original
authorship should be preserved irrespective of its validity as an email
address.
Using get_author_ident_from_commit instead of mailinfo when rebasing
preserves the original authorship.
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-am.sh | diff | blob | history | |
t/t3400-rebase.sh | diff | blob | history |