зеркало из https://github.com/microsoft/git.git
revert: refactor code to find commit subject in find_commit_subject()
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
2c048a3038
Коммит
11af2aaed6
|
@ -98,7 +98,7 @@ struct commit_message {
|
|||
static int get_message(const char *raw_message, struct commit_message *out)
|
||||
{
|
||||
const char *encoding;
|
||||
const char *p, *abbrev, *eol;
|
||||
const char *p, *abbrev;
|
||||
char *q;
|
||||
int abbrev_len, oneline_len;
|
||||
|
||||
|
@ -121,17 +121,7 @@ static int get_message(const char *raw_message, struct commit_message *out)
|
|||
abbrev = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV);
|
||||
abbrev_len = strlen(abbrev);
|
||||
|
||||
/* Find beginning and end of commit subject. */
|
||||
p = out->message;
|
||||
while (*p && (*p != '\n' || p[1] != '\n'))
|
||||
p++;
|
||||
if (*p) {
|
||||
p += 2;
|
||||
for (eol = p; *eol && *eol != '\n'; eol++)
|
||||
; /* do nothing */
|
||||
} else
|
||||
eol = p;
|
||||
oneline_len = eol - p;
|
||||
oneline_len = find_commit_subject(out->message, &p);
|
||||
|
||||
out->parent_label = xmalloc(strlen("parent of ") + abbrev_len +
|
||||
strlen("... ") + oneline_len + 1);
|
||||
|
|
19
commit.c
19
commit.c
|
@ -315,6 +315,25 @@ int parse_commit(struct commit *item)
|
|||
return ret;
|
||||
}
|
||||
|
||||
int find_commit_subject(const char *commit_buffer, const char **subject)
|
||||
{
|
||||
const char *eol;
|
||||
const char *p = commit_buffer;
|
||||
|
||||
while (*p && (*p != '\n' || p[1] != '\n'))
|
||||
p++;
|
||||
if (*p) {
|
||||
p += 2;
|
||||
for (eol = p; *eol && *eol != '\n'; eol++)
|
||||
; /* do nothing */
|
||||
} else
|
||||
eol = p;
|
||||
|
||||
*subject = p;
|
||||
|
||||
return eol - p;
|
||||
}
|
||||
|
||||
struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
|
||||
{
|
||||
struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
|
||||
|
|
3
commit.h
3
commit.h
|
@ -40,6 +40,9 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);
|
|||
|
||||
int parse_commit(struct commit *item);
|
||||
|
||||
/* Find beginning and length of commit subject. */
|
||||
int find_commit_subject(const char *commit_buffer, const char **subject);
|
||||
|
||||
struct commit_list * commit_list_insert(struct commit *item, struct commit_list **list_p);
|
||||
unsigned commit_list_count(const struct commit_list *l);
|
||||
struct commit_list * insert_by_date(struct commit *item, struct commit_list **list);
|
||||
|
|
Загрузка…
Ссылка в новой задаче