summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2014-07-28 18:42:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-28 23:17:12 (GMT)
commit2d186c8be5bea10640927e0822bd9e1c7a2e01ea (patch)
tree21ed89eff6c024292dc63b56362769bedbe05a17
parentd299e9e550c1bf8640907fdba1f03cc585ee71df (diff)
downloadgit-2d186c8be5bea10640927e0822bd9e1c7a2e01ea.zip
git-2d186c8be5bea10640927e0822bd9e1c7a2e01ea.tar.gz
git-2d186c8be5bea10640927e0822bd9e1c7a2e01ea.tar.bz2
init: avoid superfluous real_path() calls
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>
-rw-r--r--builtin/init-db.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 56f85e2..6d8ac2c 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -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);