[PATCHv2 maint] git-svn: Fix git svn log --show-commit
- From
- Bernt Hansen <bernt@norang.ca>
- Date
- May 20, 2011, 11:48 UTC
- Message-ID
- <1305892106-4584-1-git-send-email-bernt@norang.ca>
- In-Reply-To
- <3dd919897d4a5eca34f421457cc8da461574ee78.1305890184.git.git@drmicha.warpmail.net>
From: Michael J Gruber <git@drmicha.warpmail.net>
From: Michael J Gruber <git@drmicha.warpmail.net>
git svn log --show-commit had no tests and, consequently, no attention by the author of
b1b4755 (git-log: put space after commit mark, 2011-03-10)
who kept git svn log working only without --show-commit.
Introduce a test and fix it.
Reported-by: Bernt Hansen <bernt@norang.ca> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Tested-by: Bernt Hansen <bernt@norang.ca> --- This patch works for me. Thanks!
git-svn.perl | 2 +- t/t9116-git-svn-log.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl index 0fd2fd2..28d037f 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -5766,7 +5766,7 @@ sub cmd_show_log { my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/; while (<$log>) { if (/^${esc_color}commit (- )?($::sha1_short)/o) { - my $cmt = $1; + my $cmt = $2; if ($c && cmt_showable($c) && $c->{r} != $r_last) { $r_last = $c->{r}; process_commit($c, $r_min, $r_max, \@k) or diff --git a/t/t9116-git-svn-log.sh b/t/t9116-git-svn-log.sh index 5d477e4..cf4c052 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' "
-- 1.7.5.2.316.g687f