undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

init: avoid superfluous real_path() calls

Browse Source 
Feeding the result of a real_path() call to real_path() again doesn't
change that result -- the returned path won't get any more real.  Avoid
such a double call in set_git_dir_init() and for the same reason stop
calling real_path() before feeding paths to set_git_work_tree(), as the
latter already takes care of that.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2014-07-28 20:42:05 +02:00 committed by Junio C Hamano
parent d299e9e550
commit 2d186c8be5
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()
*/
git_link = xstrdup(real_path(git_dir));
set_git_dir(real_path(real_git_dir));
}
else {
real_git_dir = real_path(git_dir);
set_git_dir(real_path(git_dir));
git_link = NULL;
}
set_git_dir(real_path(real_git_dir));
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"));
}
if (work_tree)
set_git_work_tree(real_path(work_tree));
set_git_work_tree(work_tree);
else
set_git_work_tree(git_work_tree_cfg);
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 {
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);