diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-20 18:50:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-20 18:50:29 -0700 |
| commit | 391b14278e59f46ceda3b055fdc12527bc2c87fb (patch) | |
| tree | 9617952a9fc6000744f6a80773fb36890cfa0ed5 /t | |
| parent | 11bc3e92bf036480ab31657825903b9b63ad9c49 (diff) | |
| parent | 9963e025e88f134cf07ef348d80a5821c69a7eb0 (diff) | |
| download | git-391b14278e59f46ceda3b055fdc12527bc2c87fb.tar.gz | |
Merge branch 'maint'
* maint:
git-svn: Fix git svn log --show-commit
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9116-git-svn-log.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t9116-git-svn-log.sh b/t/t9116-git-svn-log.sh index 5d477e4bda..cf4c05261b 100755 --- a/t/t9116-git-svn-log.sh +++ b/t/t9116-git-svn-log.sh @@ -60,6 +60,21 @@ test_expect_success 'test ascending revision range' " git svn log -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 - " +test_expect_success 'test ascending revision range with --show-commit' " + git reset --hard trunk && + git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 - + " + +test_expect_success 'test ascending revision range with --show-commit (sha1)' " + git svn find-rev r1 >expected-range-r1-r2-r4-sha1 && + git svn find-rev r2 >>expected-range-r1-r2-r4-sha1 && + git svn find-rev r4 >>expected-range-r1-r2-r4-sha1 && + git reset --hard trunk && + git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f2 >out && + git rev-parse \$(cat out) >actual && + test_cmp expected-range-r1-r2-r4-sha1 actual + " + printf 'r4 \nr2 \nr1 \n' > expected-range-r4-r2-r1 test_expect_success 'test descending revision range' " |