aboutsummaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-18 22:21:06 -0700
committerJunio C Hamano <junkio@cox.net>2007-03-18 22:21:06 -0700
commit3635a187704ed30b32eb11f5098496e5e435a19d (patch)
tree90fbf761702cc522b5efd2fe69d02b4c797783e9 /environment.c
parentabec100c3382f7d7b759f915a86e9773277263b6 (diff)
parent38b1c6626b4690a745e23be9aa9ada98c1a55f41 (diff)
downloadgit-3635a187704ed30b32eb11f5098496e5e435a19d.tar.gz
git-3635a187704ed30b32eb11f5098496e5e435a19d.tar.xz
Merge branch 'sp/run-command'
* sp/run-command: Use run_command within send-pack Use run_command within receive-pack to invoke index-pack Use run_command within merge-index Use run_command for proxy connections Use RUN_GIT_CMD to run push backends Correct new compiler warnings in builtin-revert Replace fork_with_pipe in bundle with run_command Teach run-command to redirect stdout to /dev/null Teach run-command about stdout redirection
Diffstat (limited to 'environment.c')
-rw-r--r--environment.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/environment.c b/environment.c
index 0151ad072..fff4a4da5 100644
--- a/environment.c
+++ b/environment.c
@@ -20,7 +20,7 @@ int is_bare_repository_cfg = -1; /* unspecified */
int log_all_ref_updates = -1; /* unspecified */
int warn_ambiguous_refs = 1;
int repository_format_version;
-char *git_commit_encoding;
+const char *git_commit_encoding;
const char *git_log_output_encoding;
int shared_repository = PERM_UMASK;
const char *apply_default_whitespace;