path: root/merge-recursive.c
diff options
authorJunio C Hamano <>2006-12-19 09:28:15 (GMT)
committerJunio C Hamano <>2006-12-19 09:51:51 (GMT)
commitd4ebc36c5ee964592303c59260417b758d024c31 (patch)
treed26506bdce4e91e5eb0df875e8661fa6ac8992df /merge-recursive.c
parent75c384efb52d0e3eb1e8c2f53668b4066fe6a8d6 (diff)
Use preprocessor constants for environment variable names.
We broke the discipline Linus set up to allow compiler help us avoid typos in environment names in the early days of git over time. This defines a handful preprocessor constants for environment variable names used in relatively core parts of the system. I've left out variable names specific to subsystems such as HTTP and SSL as I do not think they are big problems. Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'merge-recursive.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 6dd6e2e..ae4dcfb 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1279,7 +1279,7 @@ int main(int argc, char *argv[])
struct commit *result, *h1, *h2;
git_config(git_default_config); /* core.filemode */
- original_index_file = getenv("GIT_INDEX_FILE");
+ original_index_file = getenv(INDEX_ENVIRONMENT);
if (!original_index_file)
original_index_file = xstrdup(git_path("index"));