Skip to content

Commit

Permalink
Export format_commit_message()
Browse files Browse the repository at this point in the history
Drop the parameter "msg" of format_commit_message() (as it can be
inferred from the parameter "commit"), add a parameter "template"
in order to avoid accessing the static variable user_format
directly and export the result.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Ren,bi(B Scharfe authored and Junio C Hamano committed Sep 3, 2007
1 parent 1e61b76 commit 7b95089
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
9 changes: 5 additions & 4 deletions commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -787,8 +787,8 @@ static void fill_person(struct interp *table, const char *msg, int len)
interp_set_entry(table, 6, show_date(date, tz, DATE_ISO8601));
}

static long format_commit_message(const struct commit *commit,
const char *msg, char **buf_p, unsigned long *space_p)
long format_commit_message(const struct commit *commit, const void *format,
char **buf_p, unsigned long *space_p)
{
struct interp table[] = {
{ "%H" }, /* commit hash */
Expand Down Expand Up @@ -843,6 +843,7 @@ static long format_commit_message(const struct commit *commit,
char parents[1024];
int i;
enum { HEADER, SUBJECT, BODY } state;
const char *msg = commit->buffer;

if (ILEFT_RIGHT + 1 != ARRAY_SIZE(table))
die("invalid interp table!");
Expand Down Expand Up @@ -924,7 +925,7 @@ static long format_commit_message(const struct commit *commit,
char *buf = *buf_p;
unsigned long space = *space_p;

space = interpolate(buf, space, user_format,
space = interpolate(buf, space, format,
table, ARRAY_SIZE(table));
if (!space)
break;
Expand Down Expand Up @@ -1165,7 +1166,7 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt,
char *buf;

if (fmt == CMIT_FMT_USERFORMAT)
return format_commit_message(commit, msg, buf_p, space_p);
return format_commit_message(commit, user_format, buf_p, space_p);

encoding = (git_log_output_encoding
? git_log_output_encoding
Expand Down
1 change: 1 addition & 0 deletions commit.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ enum cmit_fmt {
};

extern enum cmit_fmt get_commit_format(const char *arg);
extern long format_commit_message(const struct commit *commit, const void *template, char **buf_p, unsigned long *space_p);
extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *, unsigned long len, char **buf_p, unsigned long *space_p, int abbrev, const char *subject, const char *after_subject, enum date_mode dmode);

/** Removes the first commit from a list sorted by date, and adds all
Expand Down

0 comments on commit 7b95089

Please sign in to comment.