diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:45:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:45:55 -0700 |
| commit | f8aeacfa1f1e7b1f2d7b0c5fbb7becbbc6248183 (patch) | |
| tree | c9d1898aecd8d05574450db74d26c1f2c8d88741 | |
| parent | 7d9dd6da4a02d26b6841b67f6b1a8c5773114d3e (diff) | |
| parent | 487a2b732230608fe7f2cdc46c9f11bd646cb1ac (diff) | |
| download | git-f8aeacfa1f1e7b1f2d7b0c5fbb7becbbc6248183.tar.gz | |
Merge branch 'nd/git-dir-pointing-at-gitfile' into maint
* nd/git-dir-pointing-at-gitfile:
Make setup_git_env() resolve .git file when $GIT_DIR is not specified
| -rw-r--r-- | environment.c | 9 | ||||
| -rwxr-xr-x | t/t0001-init.sh | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/environment.c b/environment.c index 5398c36dd4..378254c77a 100644 --- a/environment.c +++ b/environment.c @@ -123,14 +123,13 @@ static char *expand_namespace(const char *raw_namespace) static void setup_git_env(void) { + const char *gitfile; + git_dir = getenv(GIT_DIR_ENVIRONMENT); - git_dir = git_dir ? xstrdup(git_dir) : NULL; - if (!git_dir) { - git_dir = read_gitfile(DEFAULT_GIT_DIR_ENVIRONMENT); - git_dir = git_dir ? xstrdup(git_dir) : NULL; - } if (!git_dir) git_dir = DEFAULT_GIT_DIR_ENVIRONMENT; + gitfile = read_gitfile(git_dir); + git_dir = xstrdup(gitfile ? gitfile : git_dir); git_object_dir = getenv(DB_ENVIRONMENT); if (!git_object_dir) { git_object_dir = xmalloc(strlen(git_dir) + 9); diff --git a/t/t0001-init.sh b/t/t0001-init.sh index ad66410564..9fb582b192 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -379,6 +379,10 @@ test_expect_success 'init with separate gitdir' ' test -d realgitdir/refs ' +test_expect_success 're-init on .git file' ' + ( cd newdir && git init ) +' + test_expect_success 're-init to update git link' ' ( cd newdir && |