diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-07-30 20:20:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-30 20:20:31 (GMT) |
| commit | 6fc5542564fed67a4547e1b85f9d677b81ca3164 (patch) | |
| tree | 4e90f72d18da3510002a555affecd29cf8f76427 /t/t9100-git-svn-basic.sh | |
| parent | 70cdbbe3a7028b9c1eb7542a0aa038b971d3fb27 (diff) | |
| parent | 180a4d76ac8f7c3e97be023e5943f719f3efb55b (diff) | |
| download | git-6fc5542564fed67a4547e1b85f9d677b81ca3164.zip git-6fc5542564fed67a4547e1b85f9d677b81ca3164.tar.gz git-6fc5542564fed67a4547e1b85f9d677b81ca3164.tar.bz2 | |
Merge branch 'jk/tests-timestamp-fix' into master
The test framework has been updated so that most tests will run
with predictable (artificial) timestamps.
* jk/tests-timestamp-fix:
t9100: stop depending on commit timestamps
test-lib: set deterministic default author/committer date
t9100: explicitly unset GIT_COMMITTER_DATE
t5539: make timestamp requirements more explicit
t9700: loosen ident timezone regex
t6000: use test_tick consistently
Diffstat (limited to 't/t9100-git-svn-basic.sh')
| -rwxr-xr-x | t/t9100-git-svn-basic.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh index 9f2d19e..3055943 100755 --- a/t/t9100-git-svn-basic.sh +++ b/t/t9100-git-svn-basic.sh @@ -200,8 +200,9 @@ GIT_SVN_ID=alt export GIT_SVN_ID test_expect_success "$name" \ 'git svn init "$svnrepo" && git svn fetch && - git rev-list --pretty=raw remotes/git-svn | grep ^tree | uniq > a && - git rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b && + git log --format="tree %T %s" remotes/git-svn | + awk "!seen[\$0]++ { print \$1, \$2 }" >a && + git log --format="tree %T" alt >b && test_cmp a b' name='check imported tree checksums expected tree checksums' |