diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-31 12:19:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-31 12:19:11 -0700 |
| commit | f67d2e82d6d2fd385d3d20e8d348eaf69dc95041 (patch) | |
| tree | e1c16bbf610d405e77443f51f121d857d44eba0b /log-tree.c | |
| parent | 1c9d71944a7a35cdfeb09200b20e261737cdc0b9 (diff) | |
| parent | 9553d2b26395d9a19bf60875784661090f607f4a (diff) | |
| download | git-f67d2e82d6d2fd385d3d20e8d348eaf69dc95041.tar.gz | |
Merge branch 'jk/format-patch-am'
* jk/format-patch-am:
format-patch: preserve subject newlines with -k
clean up calling conventions for pretty.c functions
pretty: add pp_commit_easy function for simple callers
mailinfo: always clean up rfc822 header folding
t: test subject handling in format-patch / am pipeline
Conflicts:
builtin/branch.c
builtin/log.c
commit.h
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c index 296f417dfc..e9457019d5 100644 --- a/log-tree.c +++ b/log-tree.c @@ -485,8 +485,10 @@ void show_log(struct rev_info *opt) ctx.date_mode = opt->date_mode; ctx.abbrev = opt->diffopt.abbrev; ctx.after_subject = extra_headers; + ctx.preserve_subject = opt->preserve_subject; ctx.reflog_info = opt->reflog_info; - pretty_print_commit(opt->commit_format, commit, &msgbuf, &ctx); + ctx.fmt = opt->commit_format; + pretty_print_commit(&ctx, commit, &msgbuf); if (opt->add_signoff) append_signoff(&msgbuf, opt->add_signoff); |