diff options
| author | David D Kilzer <ddkilzer@kilzer.net> | 2007-11-11 09:10:33 +0300 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2007-11-18 00:28:21 +0300 |
| commit | fede44b2e18c1e5985197913e8dcf5753f4eb99e (patch) | |
| tree | fd4104387e7d65a3753effa4b46ea836ed87a22b | |
| parent | 3caf320ba8fc8277b5875fe306efbfa333b92487 (diff) | |
git-svn log: fix ascending revision ranges
Fixed typo in Git::SVN::Log::git_svn_log_cmd(). Previously a command like
"git-svn log -r1:4" would only show a commit log separator.
Added tests for ascending and descending revision ranges.
Signed-off-by: David D Kilzer <ddkilzer@kilzer.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
| -rwxr-xr-x | git-svn.perl | 2 | ||||
| -rwxr-xr-x | t/t9116-git-svn-log.sh | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl index a5cf757cf6..1872214dec 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -3798,7 +3798,7 @@ sub git_svn_log_cmd { $c_max = $gs->rev_db_get($r_max); $c_min = $gs->rev_db_get($r_min); if (defined $c_min && defined $c_max) { - if ($r_max > $r_max) { + if ($r_max > $r_min) { push @cmd, "$c_min..$c_max"; } else { push @cmd, "$c_max..$c_min"; diff --git a/t/t9116-git-svn-log.sh b/t/t9116-git-svn-log.sh index 0d4e6b3f04..618d7e9c00 100755 --- a/t/t9116-git-svn-log.sh +++ b/t/t9116-git-svn-log.sh @@ -45,4 +45,18 @@ test_expect_success 'run log against a from trunk' " git svn log -r3 a | grep ^r3 " +printf 'r2 \nr4 \n' > expected-range-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-r2-r4 - + " + +printf 'r4 \nr2 \n' > expected-range-r4-r2 + +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 - + " + test_done |