summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-31 19:19:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-31 19:19:11 (GMT)
commitf67d2e82d6d2fd385d3d20e8d348eaf69dc95041 (patch)
treee1c16bbf610d405e77443f51f121d857d44eba0b /commit.h
parent1c9d71944a7a35cdfeb09200b20e261737cdc0b9 (diff)
parent9553d2b26395d9a19bf60875784661090f607f4a (diff)
downloadgit-f67d2e82d6d2fd385d3d20e8d348eaf69dc95041.zip
git-f67d2e82d6d2fd385d3d20e8d348eaf69dc95041.tar.gz
git-f67d2e82d6d2fd385d3d20e8d348eaf69dc95041.tar.bz2
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 'commit.h')
-rw-r--r--commit.h22
1 files changed, 12 insertions, 10 deletions
diff --git a/commit.h b/commit.h
index 3114bd1..a2d571b 100644
--- a/commit.h
+++ b/commit.h
@@ -69,9 +69,11 @@ enum cmit_fmt {
};
struct pretty_print_context {
+ enum cmit_fmt fmt;
int abbrev;
const char *subject;
const char *after_subject;
+ int preserve_subject;
enum date_mode date_mode;
int need_8bit_cte;
int show_notes;
@@ -96,20 +98,20 @@ extern void userformat_find_requirements(const char *fmt, struct userformat_want
extern void format_commit_message(const struct commit *commit,
const char *format, struct strbuf *sb,
const struct pretty_print_context *context);
-extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
- struct strbuf *sb,
- const struct pretty_print_context *context);
-void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
- const char *line, enum date_mode dmode,
- const char *encoding);
-void pp_title_line(enum cmit_fmt fmt,
+extern void pretty_print_commit(const struct pretty_print_context *pp,
+ const struct commit *commit,
+ struct strbuf *sb);
+extern void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
+ struct strbuf *sb);
+void pp_user_info(const struct pretty_print_context *pp,
+ const char *what, struct strbuf *sb,
+ const char *line, const char *encoding);
+void pp_title_line(const struct pretty_print_context *pp,
const char **msg_p,
struct strbuf *sb,
- const char *subject,
- const char *after_subject,
const char *encoding,
int need_8bit_cte);
-void pp_remainder(enum cmit_fmt fmt,
+void pp_remainder(const struct pretty_print_context *pp,
const char **msg_p,
struct strbuf *sb,
int indent);