Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

diff --git a/interpolate.c b/interpolate.c
index 5d9d1889f088c64131cd3c116e6a16876ce95db8..fb30694f4741147bba62350f704111d3afbf8133 100644 (file)
--- a/interpolate.c
+++ b/interpolate.c
@@ -2,8 +2,6 @@
  * Copyright 2006 Jon Loeliger
  */
 
-#include <string.h>
-
 #include "git-compat-util.h"
 #include "interpolate.h"
 
@@ -57,7 +55,7 @@ int interpolate(char *result, int reslen,
        const char *src = orig;
        char *dest = result;
        int newlen = 0;
-       char *name, *value;
+       const char *name, *value;
        int namelen, valuelen;
        int i;
        char c;