diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-19 01:28:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-19 01:51:51 -0800 |
| commit | d4ebc36c5ee964592303c59260417b758d024c31 (patch) | |
| tree | d26506bdce4e91e5eb0df875e8661fa6ac8992df /merge-recursive.c | |
| parent | 75c384efb52d0e3eb1e8c2f53668b4066fe6a8d6 (diff) | |
| download | git-d4ebc36c5ee964592303c59260417b758d024c31.tar.gz | |
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 <junkio@cox.net>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 6dd6e2e5af..ae4dcfbe5b 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")); |