Merge branch 'cr/tag-options'

diff --git a/t/t9116-git-svn-log.sh b/t/t9116-git-svn-log.sh
index 0d4e6b3f040a2cbbcfa16209c3e486427af75f55..902ed4145de5f41f3b0522fac464594e9f6e792b 100755 (executable)
--- a/t/t9116-git-svn-log.sh
+++ b/t/t9116-git-svn-log.sh
@@ -30,6 +30,12 @@ test_expect_success 'setup repository and import' "
        git reset --hard trunk &&
        echo aye >> README &&
        git commit -a -m aye &&
+       git svn dcommit &&
+       git reset --hard b &&
+       echo spy >> README &&
+       git commit -a -m spy &&
+       echo try >> README &&
+       git commit -a -m try &&
        git svn dcommit
        "
 
@@ -45,4 +51,78 @@ test_expect_success 'run log against a from trunk' "
        git svn log -r3 a | grep ^r3
        "
 
+printf 'r1 \nr2 \nr4 \n' > expected-range-r1-r2-r4
+
+test_expect_success 'test ascending revision range' "
+       git reset --hard trunk &&
+       git svn log -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | diff -u expected-range-r1-r2-r4 -
+       "
+
+printf 'r4 \nr2 \nr1 \n' > expected-range-r4-r2-r1
+
+test_expect_success 'test descending revision range' "
+       git reset --hard trunk &&
+       git svn log -r 4:1 | grep '^r[0-9]' | cut -d'|' -f1 | diff -u expected-range-r4-r2-r1 -
+       "
+
+printf 'r1 \nr2 \n' > expected-range-r1-r2
+
+test_expect_success 'test ascending revision range with unreachable revision' "
+       git reset --hard trunk &&
+       git svn log -r 1:3 | grep '^r[0-9]' | cut -d'|' -f1 | diff -u expected-range-r1-r2 -
+       "
+
+printf 'r2 \nr1 \n' > expected-range-r2-r1
+
+test_expect_success 'test descending revision range with unreachable revision' "
+       git reset --hard trunk &&
+       git svn log -r 3:1 | grep '^r[0-9]' | cut -d'|' -f1 | diff -u expected-range-r2-r1 -
+       "
+
+printf 'r2 \n' > expected-range-r2
+
+test_expect_success 'test ascending revision range with unreachable upper boundary revision and 1 commit' "
+       git reset --hard trunk &&
+       git svn log -r 2:3 | grep '^r[0-9]' | cut -d'|' -f1 | diff -u expected-range-r2 -
+       "
+
+test_expect_success 'test descending revision range with unreachable upper boundary revision and 1 commit' "
+       git reset --hard trunk &&
+       git svn log -r 3:2 | grep '^r[0-9]' | cut -d'|' -f1 | diff -u expected-range-r2 -
+       "
+
+printf 'r4 \n' > expected-range-r4
+
+test_expect_success 'test ascending revision range with unreachable lower boundary revision and 1 commit' "
+       git reset --hard trunk &&
+       git svn log -r 3:4 | grep '^r[0-9]' | cut -d'|' -f1 | diff -u expected-range-r4 -
+       "
+
+test_expect_success 'test descending revision range with unreachable lower boundary revision and 1 commit' "
+       git reset --hard trunk &&
+       git svn log -r 4:3 | grep '^r[0-9]' | cut -d'|' -f1 | diff -u expected-range-r4 -
+       "
+
+printf -- '------------------------------------------------------------------------\n' > expected-separator
+
+test_expect_success 'test ascending revision range with unreachable boundary revisions and no commits' "
+       git reset --hard trunk &&
+       git svn log -r 5:6 | diff -u expected-separator -
+       "
+
+test_expect_success 'test descending revision range with unreachable boundary revisions and no commits' "
+       git reset --hard trunk &&
+       git svn log -r 6:5 | diff -u expected-separator -
+       "
+
+test_expect_success 'test ascending revision range with unreachable boundary revisions and 1 commit' "
+       git reset --hard trunk &&
+       git svn log -r 3:5 | grep '^r[0-9]' | cut -d'|' -f1 | diff -u expected-range-r4 -
+       "
+
+test_expect_success 'test descending revision range with unreachable boundary revisions and 1 commit' "
+       git reset --hard trunk &&
+       git svn log -r 5:3 | grep '^r[0-9]' | cut -d'|' -f1 | diff -u expected-range-r4 -
+       "
+
 test_done