diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-18 11:17:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-18 11:17:40 -0700 |
| commit | 8f87d548b6c1fad5f13886f2b1a5acba2764f3b3 (patch) | |
| tree | 68e62ba17b8520bb1c1c03270ec80f148f74e250 /contrib/remote-helpers/test-bzr.sh | |
| parent | 961c1b191acccb13bab5895f546034bb2f47eddb (diff) | |
| parent | 7569accf41d28a3ede684ef96bf6edece5f06ce9 (diff) | |
| download | git-8f87d548b6c1fad5f13886f2b1a5acba2764f3b3.tar.gz | |
Merge branch 'fc/remote-helper-fixes'
* fc/remote-helper-fixes:
remote-bzr: trivial test fix
remote-bzr: include authors field in pushed commits
remote-bzr: add support for older versions
remote-hg: always normalize paths
remote-helpers: allow all tests running from any dir
Diffstat (limited to 'contrib/remote-helpers/test-bzr.sh')
| -rwxr-xr-x | contrib/remote-helpers/test-bzr.sh | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/contrib/remote-helpers/test-bzr.sh b/contrib/remote-helpers/test-bzr.sh index 4f379c2ab4..a4656ce412 100755 --- a/contrib/remote-helpers/test-bzr.sh +++ b/contrib/remote-helpers/test-bzr.sh @@ -382,7 +382,7 @@ test_expect_success 'strip' ' ' test_expect_success 'export utf-8 authors' ' - test_when_finished "rm -rf bzrrepo gitrepo && LC_ALL=C && unset GIT_COMMITTER_NAME" && + test_when_finished "rm -rf bzrrepo gitrepo && LC_ALL=C && GIT_COMMITTER_NAME=\"C O Mitter\"" LC_ALL=en_US.UTF-8 export LC_ALL @@ -411,4 +411,28 @@ test_expect_success 'export utf-8 authors' ' test_cmp expected actual ' +test_expect_success 'push different author' ' + test_when_finished "rm -rf bzrrepo gitrepo" && + + bzr init bzrrepo && + + ( + git init gitrepo && + cd gitrepo && + echo john >> content && + git add content && + git commit -m john --author "John Doe <jdoe@example.com>" && + git remote add bzr "bzr::../bzrrepo" && + git push bzr master + ) && + + ( + cd bzrrepo && + bzr log | grep "^author: " > ../actual + ) && + + echo "author: John Doe <jdoe@example.com>" > expected && + test_cmp expected actual +' + test_done |