# [PATCH v2] am: gather GIT_AUTHOR_* from original commit when rebasing 4 messages from 2010-06-15 to 2010-06-16. Participants: Jay Soffian, Johannes Sixt, Junio C Hamano. Thread: https://gitlist.dev/t/24126 ## Jay Soffian, 2010-06-15 22:39 Subject: [PATCH v2] am: gather GIT_AUTHOR_* from original commit when rebasing Message-ID: <1276641564-2074-1-git-send-email-jaysoffian@gmail.com> URL: https://gitlist.dev/e/1276641564-2074-1-git-send-email-jaysoffian%40gmail.com ``` In certain situations, commit authorship can contain an invalid e-mail address. For example, this is the case when working with git svn repos where the author email has the svn repo UUID appended such as: author@example.com In such situations, mailinfo extracts the authorship incorrectly as it assumes a valid email address. Regardless, when rebasing the original authorship should be preserved irrespective of its validity as an email address. This commit teaches am to gather the GIT_AUTHOR_* variables from the original commit, bypassing any of mailinfo's assumptions. Signed-off-by: Jay Soffian --- git-am.sh | 14 +++++++++++--- t/t3400-rebase.sh | 9 +++++++-- 2 files changed, 18 insertions(+), 5 deletions(-) This is a second take at http://article.gmane.org/gmane.comp.version-control.git/148568 diff --git a/git-am.sh b/git-am.sh index 87ffae2..568844c 100755 --- a/git-am.sh +++ b/git-am.sh @@ -613,9 +613,17 @@ 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/original-commit" + then + original_commit="$(cat "$dotest/original-commit")" + GIT_AUTHOR_NAME="$(GIT_PAGER='' git log --format=%an -1 "$original_commit")" + GIT_AUTHOR_EMAIL="$(GIT_PAGER='' git log --format=%ae -1 "$original_commit")" + GIT_AUTHOR_DATE="$(GIT_PAGER='' git log --format=%aD -1 "$original_commit")" + 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 diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index dbf7dfb..c41bcc7 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -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}) ' -- 1.7.1 ``` ## Johannes Sixt, 2010-06-16 06:30 Subject: Re: [PATCH v2] am: gather GIT_AUTHOR_* from original commit when rebasing Message-ID: <4C186F9D.1060608@viscovery.net> URL: https://gitlist.dev/e/4C186F9D.1060608%40viscovery.net In-Reply-To: <1276641564-2074-1-git-send-email-jaysoffian@gmail.com> ``` Am 6/16/2010 0:39, schrieb Jay Soffian: > + if test -f "$dotest/original-commit" > + then > + original_commit="$(cat "$dotest/original-commit")" > + GIT_AUTHOR_NAME="$(GIT_PAGER='' git log --format=%an -1 "$original_commit")" > + GIT_AUTHOR_EMAIL="$(GIT_PAGER='' git log --format=%ae -1 "$original_commit")" > + GIT_AUTHOR_DATE="$(GIT_PAGER='' git log --format=%aD -1 "$original_commit")" I think you can use the function get_author_ident_from_commit() for this. See git-sh-setup. -- Hannes ``` ## Jay Soffian, 2010-06-16 07:12 Subject: [PATCH v3] am: use get_author_ident_from_commit instead of mailinfo when rebasing Message-ID: <1276672360-15816-1-git-send-email-jaysoffian@gmail.com> URL: https://gitlist.dev/e/1276672360-15816-1-git-send-email-jaysoffian%40gmail.com In-Reply-To: <4C186F9D.1060608@viscovery.net> ``` 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 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 --- git-am.sh | 14 ++++++++++---- t/t3400-rebase.sh | 9 +++++++-- 2 files changed, 17 insertions(+), 6 deletions(-) Incorporated Hannes' suggestion to use get_author_ident_from_commit. diff --git a/git-am.sh b/git-am.sh index 87ffae2..1df5b04 100755 --- a/git-am.sh +++ b/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 diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index dbf7dfb..c41bcc7 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -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}) ' -- 1.7.1 ``` ## Junio C Hamano, 2010-06-16 19:06 Subject: Re: [PATCH v3] am: use get_author_ident_from_commit instead of mailinfo when rebasing Message-ID: <7vzkyuer0v.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vzkyuer0v.fsf%40alter.siamese.dyndns.org In-Reply-To: <1276672360-15816-1-git-send-email-jaysoffian@gmail.com> ``` Jay Soffian writes: > 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 > > 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. This justifies the motivation very well. Thanks. ```