зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
e0a9110176
Коммит
43c23251f9
14
git-am.sh
14
git-am.sh
|
@ -593,7 +593,7 @@ do
|
|||
echo "Patch is empty. Was it split wrong?"
|
||||
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") &&
|
||||
|
@ -602,6 +602,7 @@ do
|
|||
git cat-file commit "$commit" |
|
||||
sed -e '1,/^$/d' >"$dotest/msg-clean"
|
||||
echo "$commit" > "$dotest/original-commit"
|
||||
get_author_ident_from_commit "$commit" > "$dotest/author-script"
|
||||
else
|
||||
{
|
||||
sed -n '/^Subject/ s/Subject: //p' "$dotest/info"
|
||||
|
@ -613,9 +614,14 @@ do
|
|||
;;
|
||||
esac
|
||||
|
||||
GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")"
|
||||
GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
|
||||
GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"
|
||||
if test -f "$dotest/author-script"
|
||||
then
|
||||
eval $(cat "$dotest/author-script")
|
||||
else
|
||||
GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")"
|
||||
GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
|
||||
GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"
|
||||
fi
|
||||
|
||||
if test -z "$GIT_AUTHOR_EMAIL"
|
||||
then
|
||||
|
|
|
@ -10,8 +10,9 @@ among other things.
|
|||
'
|
||||
. ./test-lib.sh
|
||||
|
||||
GIT_AUTHOR_EMAIL=bogus_email_address
|
||||
export GIT_AUTHOR_EMAIL
|
||||
GIT_AUTHOR_NAME=author@name
|
||||
GIT_AUTHOR_EMAIL=bogus@email@address
|
||||
export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
|
||||
|
||||
test_expect_success \
|
||||
'prepare repository with topic branches' \
|
||||
|
@ -80,6 +81,10 @@ test_expect_success \
|
|||
'the rebase operation should not have destroyed author information' \
|
||||
'! (git log | grep "Author:" | grep "<>")'
|
||||
|
||||
test_expect_success \
|
||||
'the rebase operation should not have destroyed author information (2)' \
|
||||
"git log -1 | grep 'Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>'"
|
||||
|
||||
test_expect_success 'HEAD was detached during rebase' '
|
||||
test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
|
||||
'
|
||||
|
|
Загрузка…
Ссылка в новой задаче