diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-13 15:36:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-13 15:36:44 -0700 |
| commit | 5d8d296c1ccf00d80a6b9096e0dc88944053912f (patch) | |
| tree | 21dbcbca06f3d5c3d733f4254d46930a372a790a /builtin | |
| parent | a1204bd7c3021cbaf1f4f485eb11f2e5a72355b3 (diff) | |
| parent | c5941f1aac071addc1c9b0781c323b588c542420 (diff) | |
| download | git-5d8d296c1ccf00d80a6b9096e0dc88944053912f.tar.gz git-5d8d296c1ccf00d80a6b9096e0dc88944053912f.tar.xz | |
Merge branch 'tr/maint-show-walk'
Fixes "git show"'s auto-walking behaviour, and make it behave 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 4f1b42a68..adcbcf1f2 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -463,6 +463,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++) { |