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>
Christian Couder committed
Jul 22, 2010 at 15:18 UTC
49b7120ef1c915439b01f23f30ddfe64565ec9cc
1 file changed
+4
-10
merge-recursive.c
+4
-10
@@ -136,16 +136,10 @@ static void output_commit_title(struct merge_options *o, struct commit *commit)
136
if (parse_commit(commit) != 0)
137
printf("(bad commit)\n");
138
else {
139
- const char *s;
140
- int len;
141
- for (s = commit->buffer; *s; s++)
142
- if (*s == '\n' && s[1] == '\n') {
143
- s += 2;
144
- break;
145
- }
146
- for (len = 0; s[len] && '\n' != s[len]; len++)
147
- ; /* do nothing */
148
- printf("%.*s\n", len, s);
139
+ const char *title;
140
+ int len = find_commit_subject(commit->buffer, &title);
141
+ if (len)
142
+ printf("%.*s\n", len, title);
143
}
144
}
145
}