diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-04-03 12:31:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-03 12:31:59 -0700 |
| commit | 1030536153db404daba4a140d1e3fa1a7ba470a5 (patch) | |
| tree | 7884237494bd5202639c72dc8080f03baab35cb9 /builtin | |
| parent | Merge branch 'jk/format-patch-multiline-header' into maint (diff) | |
| parent | log: fix --max-count when used together with -S or -G (diff) | |
| download | tgif-1030536153db404daba4a140d1e3fa1a7ba470a5.tar.xz | |
Merge branch 'mm/maint-log-n-with-diff-filtering' into maint
* mm/maint-log-n-with-diff-filtering:
log: fix --max-count when used together with -S or -G
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/log.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index 0f43d2ec78..9a15d69617 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -263,7 +263,13 @@ static int cmd_log_walk(struct rev_info *rev) * retain that state information if replacing rev->diffopt in this loop */ while ((commit = get_revision(rev)) != NULL) { - log_tree_commit(rev, commit); + if (!log_tree_commit(rev, commit) && + rev->max_count >= 0) + /* + * We decremented max_count in get_revision, + * but we didn't actually show the commit. + */ + rev->max_count++; if (!rev->reflog_info) { /* we allow cycles in reflog ancestry */ free(commit->buffer); |