projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor tweak on subject line in --pretty=email
[git.git]
/
commit.c
diff --git
a/commit.c
b/commit.c
index
ca25574
..
06e0098
100644
(file)
--- a/
commit.c
+++ b/
commit.c
@@
-36,6
+36,8
@@
enum cmit_fmt get_commit_format(const char *arg)
return CMIT_FMT_FULL;
if (!strcmp(arg, "=fuller"))
return CMIT_FMT_FULLER;
return CMIT_FMT_FULL;
if (!strcmp(arg, "=fuller"))
return CMIT_FMT_FULLER;
+ if (!strcmp(arg, "=email"))
+ return CMIT_FMT_EMAIL;
if (!strcmp(arg, "=oneline"))
return CMIT_FMT_ONELINE;
die("invalid --pretty format");
if (!strcmp(arg, "=oneline"))
return CMIT_FMT_ONELINE;
die("invalid --pretty format");
@@
-160,8
+162,8
@@
struct commit_graft *read_graft_line(char *buf, int len)
if (buf[len-1] == '\n')
buf[--len] = 0;
if (buf[len-1] == '\n')
buf[--len] = 0;
- if (buf[0] == '#')
- return
0
;
+ if (buf[0] == '#'
|| buf[0] == '\0'
)
+ return
NULL
;
if ((len + 1) % 41) {
bad_graft_data:
error("bad graft data: %s", buf);
if ((len + 1) % 41) {
bad_graft_data:
error("bad graft data: %s", buf);
@@
-192,6
+194,8
@@
int read_graft_file(const char *graft_file)
/* The format is just "Commit Parent1 Parent2 ...\n" */
int len = strlen(buf);
struct commit_graft *graft = read_graft_line(buf, len);
/* The format is just "Commit Parent1 Parent2 ...\n" */
int len = strlen(buf);
struct commit_graft *graft = read_graft_line(buf, len);
+ if (!graft)
+ continue;
if (register_commit_graft(graft, 1))
error("duplicate graft data: %s", buf);
}
if (register_commit_graft(graft, 1))
error("duplicate graft data: %s", buf);
}
@@
-426,6
+430,10
@@
static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const c
time = strtoul(date, &date, 10);
tz = strtol(date, NULL, 10);
time = strtoul(date, &date, 10);
tz = strtol(date, NULL, 10);
+ if (fmt == CMIT_FMT_EMAIL) {
+ what = "From";
+ filler = "";
+ }
ret = sprintf(buf, "%s: %.*s%.*s\n", what,
(fmt == CMIT_FMT_FULLER) ? 4 : 0,
filler, namelen, line);
ret = sprintf(buf, "%s: %.*s%.*s\n", what,
(fmt == CMIT_FMT_FULLER) ? 4 : 0,
filler, namelen, line);
@@
-433,6
+441,9
@@
static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const c
case CMIT_FMT_MEDIUM:
ret += sprintf(buf + ret, "Date: %s\n", show_date(time, tz));
break;
case CMIT_FMT_MEDIUM:
ret += sprintf(buf + ret, "Date: %s\n", show_date(time, tz));
break;
+ case CMIT_FMT_EMAIL:
+ ret += sprintf(buf + ret, "Date: %s\n", show_date(time, tz));
+ break;
case CMIT_FMT_FULLER:
ret += sprintf(buf + ret, "%sDate: %s\n", what, show_date(time, tz));
break;
case CMIT_FMT_FULLER:
ret += sprintf(buf + ret, "%sDate: %s\n", what, show_date(time, tz));
break;
@@
-443,10
+454,12
@@
static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const c
return ret;
}
return ret;
}
-static int is_empty_line(const char *line, int
len
)
+static int is_empty_line(const char *line, int
*len_p
)
{
{
+ int len = *len_p;
while (len && isspace(line[len-1]))
len--;
while (len && isspace(line[len-1]))
len--;
+ *len_p = len;
return !len;
}
return !len;
}
@@
-455,7
+468,8
@@
static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *com
struct commit_list *parent = commit->parents;
int offset;
struct commit_list *parent = commit->parents;
int offset;
- if ((fmt == CMIT_FMT_ONELINE) || !parent || !parent->next)
+ if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
+ !parent || !parent->next)
return 0;
offset = sprintf(buf, "Merge:");
return 0;
offset = sprintf(buf, "Merge:");
@@
-478,9
+492,15
@@
unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit
{
int hdr = 1, body = 0;
unsigned long offset = 0;
{
int hdr = 1, body = 0;
unsigned long offset = 0;
- int indent =
(fmt == CMIT_FMT_ONELINE) ? 0 :
4;
+ int indent = 4;
int parents_shown = 0;
const char *msg = commit->buffer;
int parents_shown = 0;
const char *msg = commit->buffer;
+ const char *subject = NULL;
+
+ if (fmt == CMIT_FMT_EMAIL)
+ subject = "Subject: [PATCH] ";
+ if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
+ indent = 0;
for (;;) {
const char *line = msg;
for (;;) {
const char *line = msg;
@@
-504,7
+524,7
@@
unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit
if (hdr) {
if (linelen == 1) {
hdr = 0;
if (hdr) {
if (linelen == 1) {
hdr = 0;
- if (
fmt != CMIT_FMT_ONELINE
)
+ if (
(fmt != CMIT_FMT_ONELINE) && !subject
)
buf[offset++] = '\n';
continue;
}
buf[offset++] = '\n';
continue;
}
@@
-542,20
+562,28
@@
unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit
continue;
}
continue;
}
- if (is_empty_line(line, linelen)) {
+ if (is_empty_line(line,
&
linelen)) {
if (!body)
continue;
if (!body)
continue;
+ if (subject)
+ continue;
if (fmt == CMIT_FMT_SHORT)
break;
} else {
body = 1;
}
if (fmt == CMIT_FMT_SHORT)
break;
} else {
body = 1;
}
+ if (subject) {
+ memcpy(buf + offset, subject, 9);
+ offset += 9;
+ }
memset(buf + offset, ' ', indent);
memcpy(buf + offset + indent, line, linelen);
offset += linelen + indent;
memset(buf + offset, ' ', indent);
memcpy(buf + offset + indent, line, linelen);
offset += linelen + indent;
+ buf[offset++] = '\n';
if (fmt == CMIT_FMT_ONELINE)
break;
if (fmt == CMIT_FMT_ONELINE)
break;
+ subject = NULL;
}
while (offset && isspace(buf[offset-1]))
offset--;
}
while (offset && isspace(buf[offset-1]))
offset--;