Merge branch 'maint' to synchronize with 1.5.0.6

diff --cc commit.c
index a4f2e74c0b9b17a467fd9c4d3f5a2d275d5ea038,1fe23b6e3a9d4bf46948be2b19a96049d944bb1a..754d1b8a0b8282fd3d1d6bd8f6ccb21b407504a5
--- 1/commit.c
--- 2/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;

diff --cc git-commit.sh
Simple merge