From: Junio C Hamano <junkio@cox.net>
Date: Wed, 28 Mar 2007 22:39:57 +0000 (-0700)
Subject: Merge branch 'maint' to synchronize with 1.5.0.6
X-Git-Tag: v1.5.1-rc3~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0a98f9d13802880a68ce6564b9f47b1c3e3341c7;p=git.git

Merge branch 'maint' to synchronize with 1.5.0.6
---

0a98f9d13802880a68ce6564b9f47b1c3e3341c7
diff --cc commit.c
index a4f2e74c0,1fe23b6e3..754d1b8a0
--- a/commit.c
+++ b/commit.c
@@@ -651,9 -641,10 +651,10 @@@ static char *get_header(const struct co
  	}
  }
  
 -static char *replace_encoding_header(char *buf, char *encoding)
 +static char *replace_encoding_header(char *buf, const char *encoding)
  {
  	char *encoding_header = strstr(buf, "\nencoding ");
+ 	char *header_end = strstr(buf, "\n\n");
  	char *end_of_encoding_header;
  	int encoding_header_pos;
  	int encoding_header_len;