show: fix "range implies walking"

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/log.c b/builtin/log.c
index 56bc555d11e25056eab45e92ac43ee885fb55bf7..9ea2eb7bb058ed4255b83a9a4f49cc969baa3626 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -451,6 +451,9 @@ int cmd_show(int argc, const char **argv, const char *prefix)
        opt.tweak = show_rev_tweak_rev;
        cmd_log_init(argc, argv, prefix, &rev, &opt);
 
        opt.tweak = show_rev_tweak_rev;
        cmd_log_init(argc, argv, prefix, &rev, &opt);
 

+       if (!rev.no_walk)
+               return cmd_log_walk(&rev);
+

        count = rev.pending.nr;
        objects = rev.pending.objects;
        for (i = 0; i < count && !ret; i++) {
        count = rev.pending.nr;
        objects = rev.pending.objects;
        for (i = 0; i < count && !ret; i++) {

diff --git a/t/t7007-show.sh b/t/t7007-show.sh
index 891b143e0cb00e704e788c2ea4e1c5d64665d8fd..a40cd3630c28a13f4e0f36ef9f56925d3c8579ed 100755 (executable)
--- a/t/t7007-show.sh
+++ b/t/t7007-show.sh
@@ -57,7 +57,7 @@ test_expect_success 'showing a range walks (Y shape, ^ first)' '
        test_cmp expect actual.filtered
 '
 
        test_cmp expect actual.filtered
 '
 

-test_expect_failure 'showing a range walks (Y shape, ^ last)' '
+test_expect_success 'showing a range walks (Y shape, ^ last)' '

        cat >expect <<-EOF &&
        commit $(git rev-parse main3)
        commit $(git rev-parse main2)
        cat >expect <<-EOF &&
        commit $(git rev-parse main3)
        commit $(git rev-parse main2)


@@ -98,7 +98,7 @@ test_expect_success 'showing annotated tag plus commit' '
        test_cmp expect actual.filtered
 '
 
        test_cmp expect actual.filtered
 '
 

-test_expect_failure 'showing range' '
+test_expect_success 'showing range' '

        cat >expect <<-EOF &&
        commit $(git rev-parse main3)
        commit $(git rev-parse main2)
        cat >expect <<-EOF &&
        commit $(git rev-parse main3)
        commit $(git rev-parse main2)