summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-06-19 14:15:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-19 14:15:57 -0700
commitc5941f1aac071addc1c9b0781c323b588c542420 (patch)
treede52194e50c2c079bca5990a3c0bbdfb433906d9 /builtin
parentDemonstrate git-show is broken with ranges (diff)
downloadtgif-c5941f1aac071addc1c9b0781c323b588c542420.tar.xz
show: fix "range implies walking"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/log.c3
1 files changed, 3 insertions, 0 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++) {