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 /builtin/rev-list.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 'builtin/rev-list.c')
| -rw-r--r-- | builtin/rev-list.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 4be66998f6..56727e8c1d 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -104,7 +104,8 @@ static void show_commit(struct commit *commit, void *data) struct pretty_print_context ctx = {0}; ctx.abbrev = revs->abbrev; ctx.date_mode = revs->date_mode; - pretty_print_commit(revs->commit_format, commit, &buf, &ctx); + ctx.fmt = revs->commit_format; + pretty_print_commit(&ctx, commit, &buf); if (revs->graph) { if (buf.len) { if (revs->commit_format != CMIT_FMT_ONELINE) |