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

Merge branch 'jx/relative-path-regression-fix'

Browse Source 
* jx/relative-path-regression-fix:
  Use simpler relative_path when set_git_dir
  relative_path should honor dos-drive-prefix
  test: use unambigous leading path (/foo) for MSYS
This commit is contained in:
Junio C Hamano
2013-10-28 10:42:29 -07:00
parent 3d092bfc6f 41894ae3a3
commit e22c1c7f19
4 changed files with 99 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
setup.c
View File

@ -227,7 +227,6 @@ int is_inside_work_tree(void)
void setup_work_tree(void)
{
struct strbuf sb = STRBUF_INIT;
const char *work_tree, *git_dir;
static int initialized = 0;
@ -247,10 +246,8 @@ void setup_work_tree(void)
if (getenv(GIT_WORK_TREE_ENVIRONMENT))
setenv(GIT_WORK_TREE_ENVIRONMENT, ".", 1);
set_git_dir(relative_path(git_dir, work_tree, &sb));
set_git_dir(remove_leading_path(git_dir, work_tree));
initialized = 1;
strbuf_release(&sb);
}
static int check_repository_format_gently(const char *gitdir, int *nongit_ok)