mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-01-24 16:34:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

show: fix "range implies walking"

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2012-06-19 14:15:57 -07:00
parent b0082b9d59
commit c5941f1aac
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/log.c
View File

@ -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++) {

4
t/t7007-show.sh
View File

@ -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)