diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-06-19 14:15:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-19 14:15:57 -0700 |
| commit | c5941f1aac071addc1c9b0781c323b588c542420 (patch) | |
| tree | de52194e50c2c079bca5990a3c0bbdfb433906d9 | |
| parent | Demonstrate git-show is broken with ranges (diff) | |
| download | tgif-c5941f1aac071addc1c9b0781c323b588c542420.tar.xz | |
show: fix "range implies walking"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/log.c | 3 | ||||
| -rwxr-xr-x | t/t7007-show.sh | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/builtin/log.c b/builtin/log.c index 56bc555d11..9ea2eb7bb0 100644 --- 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); + if (!rev.no_walk) + return cmd_log_walk(&rev); + 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 891b143e0c..a40cd3630c 100755 --- 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_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) @@ -98,7 +98,7 @@ test_expect_success 'showing annotated tag plus commit' ' 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) |