summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 00:50:46 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 00:50:46 (GMT)
commit9b66ec04741b4030e7654dcb7b978a29a8214b31 (patch)
tree0f39632df69a6b7898fc5057e26dab67e7983537 /commit.c
parentf336e71f86560df3503c1da1f68635a184af28a9 (diff)
downloadgit-9b66ec04741b4030e7654dcb7b978a29a8214b31.zip
git-9b66ec04741b4030e7654dcb7b978a29a8214b31.tar.gz
git-9b66ec04741b4030e7654dcb7b978a29a8214b31.tar.bz2
Add "--pretty=full" format that also shows committer.
Also move the common implementation of parsing the --pretty argument format into commit.c rather than having duplicates in diff-tree.c and rev-list.c.
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c26
1 files changed, 22 insertions, 4 deletions
diff --git a/commit.c b/commit.c
index 738590f..03f8ca8 100644
--- a/commit.c
+++ b/commit.c
@@ -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;
}