summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-23 22:24:01 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-23 22:24:01 -0800
commit783cfafb91538c178d78a9f6c7b609e4f06582f8 (patch)
tree242cb4414ba31ea251d701c8ebdf25f01ce3f4f8 /environment.c
parent75a7ea258c0644b79e57cab3a345807f4017dfd2 (diff)
parent0de8b94720501e869a05c52a691985fa4ce69803 (diff)
downloadgit-783cfafb91538c178d78a9f6c7b609e4f06582f8.tar.gz
Merge branch 'cc/replace'
* cc/replace: Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS Documentation: fix typos and spelling in replace documentation replace: use a GIT_NO_REPLACE_OBJECTS env variable
Diffstat (limited to 'environment.c')
-rw-r--r--environment.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/environment.c b/environment.c
index 571ab56b7e..5171d9f9a4 100644
--- a/environment.c
+++ b/environment.c
@@ -84,6 +84,8 @@ static void setup_git_env(void)
git_graft_file = getenv(GRAFT_ENVIRONMENT);
if (!git_graft_file)
git_graft_file = git_pathdup("info/grafts");
+ if (getenv(NO_REPLACE_OBJECTS_ENVIRONMENT))
+ read_replace_refs = 0;
}
int is_bare_repository(void)