summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-20 21:56:14 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-20 21:56:14 (GMT)
commitaa1cef54a2bcc5350df7efe1d1745725c46bf2e3 (patch)
treeb8cbf49ff59b92c36de05d08f2dfd32c4aeb538b /merge-recursive.c
parent1d182bd5f4ec17f2f44ac0ee0d1bf6a25e98761e (diff)
parent4363dfbe3d2f3fe3a4bd0fa7e9b22a14532c6cdb (diff)
downloadgit-aa1cef54a2bcc5350df7efe1d1745725c46bf2e3.zip
git-aa1cef54a2bcc5350df7efe1d1745725c46bf2e3.tar.gz
git-aa1cef54a2bcc5350df7efe1d1745725c46bf2e3.tar.bz2
Merge branch 'jc/clone'
* jc/clone: Move "no merge candidate" warning into git-pull Use preprocessor constants for environment variable names. Do not create $GIT_DIR/remotes/ directory anymore. Introduce GIT_TEMPLATE_DIR Revert "fix testsuite: make sure they use templates freshly built from the source" fix testsuite: make sure they use templates freshly built from the source git-clone: lose the traditional 'no-separate-remote' layout git-clone: lose the artificial "first" fetch refspec git-pull: refuse default merge without branch.*.merge git-clone: use wildcard specification for tracking branches
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 1de273e..ae7ae4c 100644
--- 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"));