mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/maint-setup'

Browse Source 
* nd/maint-setup:
  Kill off get_relative_cwd()
  setup: return correct prefix if worktree is '/'

Conflicts:
	dir.c
	setup.c
This commit is contained in:
Junio C Hamano
2011-05-02 15:58:30 -07:00
parent 2db8926236 b892913d51
commit c67e367c50
3 changed files with 34 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
setup.c
View File

@ -325,6 +325,7 @@ static const char *setup_explicit_git_dir(const char *gitdirenv,
const char *work_tree_env = getenv(GIT_WORK_TREE_ENVIRONMENT);
const char *worktree;
char *gitfile;
int offset;
if (PATH_MAX - 40 < strlen(gitdirenv))
die("'$%s' too big", GIT_DIR_ENVIRONMENT);
@ -390,15 +391,15 @@ static const char *setup_explicit_git_dir(const char *gitdirenv,
return NULL;
}
if (!prefixcmp(cwd, worktree) &&
cwd[strlen(worktree)] == '/') { /* cwd inside worktree */
offset = dir_inside_of(cwd, worktree);
if (offset >= 0) { /* cwd inside worktree? */
set_git_dir(real_path(gitdirenv));
if (chdir(worktree))
die_errno("Could not chdir to '%s'", worktree);
cwd[len++] = '/';
cwd[len] = '\0';
free(gitfile);
return cwd + strlen(worktree) + 1;
return cwd + offset;
}
/* cwd outside worktree */