kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'kl/setup-in-unreadable-worktree' 

Disable the "do not remove the directory the user started Git in"
logic when Git cannot tell where that directory is.  Earlier we
refused to run in such a case.

* kl/setup-in-unreadable-worktree:
  setup: don't die if realpath(3) fails on getcwd(3)
maint
Junio C Hamano 2022-06-03 14:30:36 -07:00
parent 28db3b7b71 c37c6dc6a7
commit 37d4ae58ef
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
setup.c
View File

@ -459,7 +459,16 @@ static void setup_original_cwd(void)
*/ */


/* Normalize the directory */ /* Normalize the directory */
strbuf_realpath(&tmp, tmp_original_cwd, 1); if (!strbuf_realpath(&tmp, tmp_original_cwd, 0)) {
trace2_data_string("setup", the_repository,
"realpath-path", tmp_original_cwd);
trace2_data_string("setup", the_repository,
"realpath-failure", strerror(errno));
free((char*)tmp_original_cwd);
tmp_original_cwd = NULL;
return;
}

free((char*)tmp_original_cwd); free((char*)tmp_original_cwd);
tmp_original_cwd = NULL; tmp_original_cwd = NULL;
startup_info->original_cwd = strbuf_detach(&tmp, NULL); startup_info->original_cwd = strbuf_detach(&tmp, NULL);