summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-10-30 20:18:31 -0700
committerJunio C Hamano <gitster@pobox.com>2009-10-30 20:18:31 -0700
commit5f809ff50921bee44bbf88c49056e7d145c0c35f (patch)
tree451ba24442900b54c90264056998effaf25cd4eb /commit.h
parentd39d667169fda640065d48b70288c3342bd3195d (diff)
parentb7b10385a84c741a4fe219807c9511f69403640a (diff)
downloadgit-5f809ff50921bee44bbf88c49056e7d145c0c35f.tar.gz
fixup tr/stash-format merge
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h20
1 files changed, 14 insertions, 6 deletions
diff --git a/commit.h b/commit.h
index 95f981a1a9..422f778f3f 100644
--- a/commit.h
+++ b/commit.h
@@ -63,6 +63,16 @@ enum cmit_fmt {
CMIT_FMT_UNSPECIFIED,
};
+struct pretty_print_context
+{
+ int abbrev;
+ const char *subject;
+ const char *after_subject;
+ enum date_mode date_mode;
+ int need_8bit_cte;
+ struct reflog_walk_info *reflog_info;
+};
+
extern int non_ascii(int);
extern int has_non_ascii(const char *text);
struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
@@ -71,12 +81,10 @@ extern char *reencode_commit_message(const struct commit *commit,
extern void get_commit_format(const char *arg, struct rev_info *);
extern void format_commit_message(const struct commit *commit,
const char *format, struct strbuf *sb,
- enum date_mode dmode);
-extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit*,
- struct strbuf *,
- int abbrev, const char *subject,
- const char *after_subject, enum date_mode,
- int need_8bit_cte);
+ 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);