diff options
Diffstat (limited to 'commit.c')
| -rw-r--r-- | commit.c | 26 |
1 files changed, 22 insertions, 4 deletions
@@ -5,6 +5,21 @@ const char *commit_type = "commit"; +enum cmit_fmt get_commit_format(const char *arg) +{ + if (!*arg) + return CMIT_FMT_DEFAULT; + if (!strcmp(arg, "=raw")) + return CMIT_FMT_RAW; + if (!strcmp(arg, "=medium")) + return CMIT_FMT_MEDIUM; + if (!strcmp(arg, "=short")) + return CMIT_FMT_SHORT; + if (!strcmp(arg, "=full")) + return CMIT_FMT_FULL; + die("invalid --pretty format"); +} + static struct commit *check_commit(struct object *obj, const unsigned char *sha1) { if (obj->type != commit_type) { @@ -196,14 +211,13 @@ static int get_one_line(const char *msg, unsigned long len) return ret; } -static int add_author_info(enum cmit_fmt fmt, char *buf, const char *line, int len) +static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const char *line) { char *date; unsigned int namelen; unsigned long time; int tz, ret; - line += strlen("author "); date = strchr(line, '>'); if (!date) return 0; @@ -211,7 +225,7 @@ static int add_author_info(enum cmit_fmt fmt, char *buf, const char *line, int l time = strtoul(date, &date, 10); tz = strtol(date, NULL, 10); - ret = sprintf(buf, "Author: %.*s\n", namelen, line); + ret = sprintf(buf, "%s: %.*s\n", what, namelen, line); if (fmt == CMIT_FMT_MEDIUM) ret += sprintf(buf + ret, "Date: %s\n", show_date(time, tz)); return ret; @@ -284,7 +298,11 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned l offset += add_parent_info(fmt, buf + offset, line, ++parents); } if (!memcmp(line, "author ", 7)) - offset += add_author_info(fmt, buf + offset, line, linelen); + offset += add_user_info("Author", fmt, buf + offset, line + 7); + if (fmt == CMIT_FMT_FULL) { + if (!memcmp(line, "committer ", 10)) + offset += add_user_info("Commit", fmt, buf + offset, line + 10); + } continue; } |