mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-21 09:18:12 +02:00
Code

Merge branch 'rs/init-no-duplicate-real-path'

Browse Source 
* rs/init-no-duplicate-real-path:
  init: avoid superfluous real_path() calls
This commit is contained in:
Junio C Hamano 2014-09-02 13:24:04 -07:00
commit e8e4ce72cd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/init-db.c
View File

@ -330,12 +330,12 @@ int set_git_dir_init(const char *git_dir, const char *real_git_dir,
* moving the target repo later on in separate_git_dir() * moving the target repo later on in separate_git_dir()
*/ */
git_link = xstrdup(real_path(git_dir)); git_link = xstrdup(real_path(git_dir));
set_git_dir(real_path(real_git_dir));
} }
else { else {
real_git_dir = real_path(git_dir); set_git_dir(real_path(git_dir));
git_link = NULL; git_link = NULL;
} }
set_git_dir(real_path(real_git_dir));
return 0; return 0;
} }
@ -578,7 +578,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
die_errno (_("Cannot access current working directory")); die_errno (_("Cannot access current working directory"));
} }
if (work_tree) if (work_tree)
set_git_work_tree(real_path(work_tree)); set_git_work_tree(work_tree);
else else
set_git_work_tree(git_work_tree_cfg); set_git_work_tree(git_work_tree_cfg);
if (access(get_git_work_tree(), X_OK)) if (access(get_git_work_tree(), X_OK))
@ -587,7 +587,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
} }
else { else {
if (work_tree) if (work_tree)
set_git_work_tree(real_path(work_tree)); set_git_work_tree(work_tree);
} }
set_git_dir_init(git_dir, real_git_dir, 1); set_git_dir_init(git_dir, real_git_dir, 1);