summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-03 16:25:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-04-03 16:25:41 (GMT)
commiteeecf393972b9ca4a37adb8785f16e9617eecc57 (patch)
tree93ce84715443f1ef90ce5f8e90ebb75cf4056103 /git.c
parente6658b9d6917d9888fa41702bf53393c57de0631 (diff)
parent2cd83d10bb6bcf768129e1c4e5a4dee4b6bcd27f (diff)
downloadgit-eeecf393972b9ca4a37adb8785f16e9617eecc57.zip
git-eeecf393972b9ca4a37adb8785f16e9617eecc57.tar.gz
git-eeecf393972b9ca4a37adb8785f16e9617eecc57.tar.bz2
Merge branch 'jk/alias-in-bare' into maint
An aliased command spawned from a bare repository that does not say it is bare with "core.bare = yes" is treated as non-bare by mistake. * jk/alias-in-bare: setup: suppress implicit "." work-tree for bare repos environment: add GIT_PREFIX to local_repo_env cache.h: drop LOCAL_REPO_ENV_SIZE
Diffstat (limited to 'git.c')
-rw-r--r--git.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/git.c b/git.c
index 39ba6b1..850d3f5 100644
--- a/git.c
+++ b/git.c
@@ -125,6 +125,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
static char git_dir[PATH_MAX+1];
is_bare_repository_cfg = 1;
setenv(GIT_DIR_ENVIRONMENT, getcwd(git_dir, sizeof(git_dir)), 0);
+ setenv(GIT_IMPLICIT_WORK_TREE_ENVIRONMENT, "0", 1);
if (envchanged)
*envchanged = 1;
} else if (!strcmp(cmd, "-c")) {