diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-28 16:18:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-28 16:18:43 -0700 |
| commit | 339aec7acbd43f831ffc7dd193f53a34f918d4fb (patch) | |
| tree | 8647a694cb47666039e5dd25a51af5d59818a6a2 /t | |
| parent | 6c1c4423e2f83037ef762d63be6edbc1f9e6e867 (diff) | |
| parent | 43c23251f924db4188cf74361cb7cc3257accce3 (diff) | |
| download | git-339aec7acbd43f831ffc7dd193f53a34f918d4fb.tar.gz git-339aec7acbd43f831ffc7dd193f53a34f918d4fb.tar.xz | |
Merge branch 'js/maint-am-rebase-invalid-author' into maint
* js/maint-am-rebase-invalid-author:
am: use get_author_ident_from_commit instead of mailinfo when rebasing
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3400-rebase.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index dbf7dfba9..c41bcc7d6 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}) ' |