X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=builtin-fmt-merge-msg.c;h=fae1482ba91937232f427a3f5dd03c587c3fba57;hb=b91ffd37d5c18046f7b0bf47e939273bead9e52e;hp=c566c2df77b1b7da2bff11c70e06b91128fdc71e;hpb=4c8d4c14c6de59bc14d6118724ffee949e8654a7;p=thirdparty%2Fgit.git

diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index c566c2df77..fae1482ba9 100644
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -256,8 +256,7 @@ static void shortlog(const char *name, unsigned char *sha1,
 
 int fmt_merge_msg(int merge_summary, struct strbuf *in, struct strbuf *out) {
 	int limit = 20, i = 0, pos = 0;
-	char line[1024];
-	char *p = line, *sep = "";
+	char *sep = "";
 	unsigned char head_sha1[20];
 	const char *current_branch;
 
@@ -271,9 +270,8 @@ int fmt_merge_msg(int merge_summary, struct strbuf *in, struct strbuf *out) {
 	/* get a line */
 	while (pos < in->len) {
 		int len;
-		char *newline;
+		char *newline, *p = in->buf + pos;
 
-		p = in->buf + pos;
 		newline = strchr(p, '\n');
 		len = newline ? newline - p : strlen(p);
 		pos += len + !!newline;