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/merge.c | |
| parent | 1c9d71944a7a35cdfeb09200b20e261737cdc0b9 (diff) | |
| parent | 9553d2b26395d9a19bf60875784661090f607f4a (diff) | |
| download | git-f67d2e82d6d2fd385d3d20e8d348eaf69dc95041.tar.gz git-f67d2e82d6d2fd385d3d20e8d348eaf69dc95041.tar.xz | |
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/merge.c')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 5a2a1eb79..325891edb 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -339,13 +339,14 @@ static void squash_message(void) ctx.abbrev = rev.abbrev; ctx.date_mode = rev.date_mode; + ctx.fmt = rev.commit_format; strbuf_addstr(&out, "Squashed commit of the following:\n"); while ((commit = get_revision(&rev)) != NULL) { strbuf_addch(&out, '\n'); strbuf_addf(&out, "commit %s\n", sha1_to_hex(commit->object.sha1)); - pretty_print_commit(rev.commit_format, commit, &out, &ctx); + pretty_print_commit(&ctx, commit, &out); } if (write(fd, out.buf, out.len) < 0) die_errno(_("Writing SQUASH_MSG")); |