diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-07-22 13:01:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-22 13:01:40 -0700 |
| commit | 1f5881d3fcfd8e2cc69ebd96f24d5db797795844 (patch) | |
| tree | 3c019643f7db8340f2dde5e56c6b060748013aa8 /builtin | |
| parent | Merge branch 'jc/refactor-diff-stdin' into maint (diff) | |
| parent | show: fix "range implies walking" (diff) | |
| download | tgif-1f5881d3fcfd8e2cc69ebd96f24d5db797795844.tar.xz | |
Merge branch 'tr/maint-show-walk' into maint
"git show"'s auto-walking behaviour was an unreliable and
unpredictable hack; it now behaves just like "git log" does when it
walks.
* tr/maint-show-walk:
show: fix "range implies walking"
Demonstrate git-show is broken with ranges
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/log.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c index 906dca475a..54f24e2088 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -462,6 +462,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++) { |