Merge branch 'sp/run-command'

diff --git a/cache.h b/cache.h
index 3818e10f8c1a65cc4e4cf339bb5f7f324e8a7c4c..5396d3366dd5d802a4e3ce43d296957c94ddb028 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -451,7 +451,7 @@ extern int check_repository_format_version(const char *var, const char *value);
 extern char git_default_email[MAX_GITNAME];
 extern char git_default_name[MAX_GITNAME];
 
-extern char *git_commit_encoding;
+extern const char *git_commit_encoding;
 extern const char *git_log_output_encoding;
 
 extern int copy_fd(int ifd, int ofd);