global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-17 04:00:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jn/setup-fixes' into next

Browse Source 
* jn/setup-fixes:
  Subject: setup: officially support --work-tree without --git-dir
  tests: compress the setup tests
  tests: cosmetic improvements to the repo-setup test
This commit is contained in:
Junio C Hamano
2011-01-21 14:38:37 -08:00
parent 0dd9806a65 4868b2ea17
commit 4bea95515a
2 changed files with 698 additions and 4436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
setup.c
View File

@@ -414,6 +414,15 @@ static const char *setup_discovered_git_dir(const char *gitdir,
if (check_repository_format_gently(gitdir, nongit_ok))
return NULL;
/* --work-tree is set without --git-dir; use discovered one */
if (getenv(GIT_WORK_TREE_ENVIRONMENT) || git_work_tree_cfg) {
if (offset != len && !is_absolute_path(gitdir))
gitdir = xstrdup(make_absolute_path(gitdir));
if (chdir(cwd))
die_errno("Could not come back to cwd");
return setup_explicit_git_dir(gitdir, cwd, len, nongit_ok);
}
/* #16.2, #17.2, #20.2, #21.2, #24, #25, #28, #29 (see t1510) */
if (is_bare_repository_cfg > 0) {
set_git_dir(offset == len ? gitdir : make_absolute_path(gitdir));
@@ -446,6 +455,16 @@ static const char *setup_bare_git_dir(char *cwd, int offset, int len, int *nongi
if (check_repository_format_gently(".", nongit_ok))
return NULL;
/* --work-tree is set without --git-dir; use discovered one */
if (getenv(GIT_WORK_TREE_ENVIRONMENT) || git_work_tree_cfg) {
const char *gitdir;
gitdir = offset == len ? "." : xmemdupz(cwd, offset);
if (chdir(cwd))
die_errno("Could not come back to cwd");
return setup_explicit_git_dir(gitdir, cwd, len, nongit_ok);
}
inside_git_dir = 1;
inside_work_tree = 0;
if (offset != len) {

5115
t/t1510-repo-setup.sh
View File

File diff suppressed because it is too large Load Diff