diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-19 18:06:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-19 18:06:08 -0700 |
| commit | ae514b4c5b51e9b4ee1071898481c01b4d90f67b (patch) | |
| tree | 6cdb3662510c7777d59760b13aef1daa6b7302a9 /builtin-log.c | |
| parent | Merge branch 'lt/dirwalk' into next (diff) | |
| parent | Merge branch 'js/fetchconfig' (diff) | |
| download | tgif-ae514b4c5b51e9b4ee1071898481c01b4d90f67b.tar.xz | |
Merge branch 'master' into next
* master:
Fix build procedure for builtin-init-db
Allow pickaxe and diff-filter options to be used by git log.
Libify the index refresh logic
Builtin git-init-db
Diffstat (limited to 'builtin-log.c')
| -rw-r--r-- | builtin-log.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/builtin-log.c b/builtin-log.c index d5bbc1cc06..12a6d19203 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -23,6 +23,13 @@ static int cmd_log_wc(int argc, const char **argv, char **envp, rev->commit_format = CMIT_FMT_DEFAULT; rev->verbose_header = 1; argc = setup_revisions(argc, argv, rev, "HEAD"); + if (rev->always_show_header) { + if (rev->diffopt.pickaxe || rev->diffopt.filter) { + rev->always_show_header = 0; + if (rev->diffopt.output_format == DIFF_FORMAT_RAW) + rev->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT; + } + } if (argc > 1) die("unrecognized argument: %s", argv[1]); |