diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-10-15 22:31:47 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-15 22:31:47 -0400 |
| commit | d55e7c3acf72413563e695a19f7f66efac442064 (patch) | |
| tree | b12d163ceb3e56e36a90c82b9c075a3401cd00d3 /log-tree.c | |
| parent | 03618b9df84a0e94e36fdb27060e605e85b956e9 (diff) | |
| parent | 8492f00b4f28471af84d3887096257822c4d2bc9 (diff) | |
| download | git-d55e7c3acf72413563e695a19f7f66efac442064.tar.gz git-d55e7c3acf72413563e695a19f7f66efac442064.tar.xz | |
Merge branch 'maint'
* maint:
Whip post 1.5.3.4 maintenance series into shape.
rebase -i: use diff plumbing instead of porcelain
Do not remove distributed configure script
git-archive: document --exec
git-reflog: document --verbose
git-config: handle --file option with relative pathname properly
clear_commit_marks(): avoid deep recursion
git add -i: Remove unused variables
git add -i: Fix parsing of abbreviated hunk headers
git-config: don't silently ignore options after --list
Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
Fix embarrassing "git log --follow" bug
Conflicts:
RelNotes
git-rebase--interactive.sh
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c index 23191543d..62edd3445 100644 --- a/log-tree.c +++ b/log-tree.c @@ -304,7 +304,8 @@ int log_tree_diff_flush(struct rev_info *opt) * output for readability. */ show_log(opt, opt->diffopt.msg_sep); - if (opt->verbose_header && + if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) && + opt->verbose_header && opt->commit_format != CMIT_FMT_ONELINE) { int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH; if ((pch & opt->diffopt.output_format) == pch) |