Merge branch 'js/rerere'

[git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index 1de273ea1e4f309b542c8ebfce706ba422e1cd74..ae7ae4cd2a9ce392945ad8ed27e4289c27ee24bd 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1272,7 +1272,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"));