From: Christian Couder <chriscool@tuxfamily.org>
Date: Thu, 22 Jul 2010 13:18:34 +0000 (+0200)
Subject: merge-recursive: use find_commit_subject() instead of custom code
X-Git-Tag: v1.7.3-rc0~64^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=49b7120ef1c915439b01f23f30ddfe64565ec9cc;p=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>
---

diff --git a/merge-recursive.c b/merge-recursive.c
index 206c10363..34837bd5d 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -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);
 		}
 	}
 }