зеркало из https://github.com/microsoft/git.git
merge-recursive: use find_commit_subject() instead of custom code
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
56ff37941e
Коммит
49b7120ef1
|
@ -136,16 +136,10 @@ static void output_commit_title(struct merge_options *o, struct commit *commit)
|
|||
if (parse_commit(commit) != 0)
|
||||
printf("(bad commit)\n");
|
||||
else {
|
||||
const char *s;
|
||||
int len;
|
||||
for (s = commit->buffer; *s; s++)
|
||||
if (*s == '\n' && s[1] == '\n') {
|
||||
s += 2;
|
||||
break;
|
||||
}
|
||||
for (len = 0; s[len] && '\n' != s[len]; len++)
|
||||
; /* do nothing */
|
||||
printf("%.*s\n", len, s);
|
||||
const char *title;
|
||||
int len = find_commit_subject(commit->buffer, &title);
|
||||
if (len)
|
||||
printf("%.*s\n", len, title);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче