Daniel BarkalowOnce we find the absolute paths for git_dir and work_tree, we can make git_dir a relative path since we know pwd will be work_tree. This should save the kernel some time traversing the path to work_tree all the time if git_dir is inside work_tree.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> --- I think this should do what Linus wanted without losing the ability to have unrelated work tree and git dir locations. I'm not entirely sure if there's any meaningful difference between this and setting git_dir to an absolute path if it or work_tree is provided, and otherwise just using ".git", but this is a relatively small and obvious change that should also help if the user, for some reason, specifies the directories explicitly such that they're in the usual relationship.
cache.h | 1 + path.c | 14 ++++++++++++++ setup.c | 9 ++++++--- 3 files changed, 21 insertions(+), 3 deletions(-)
Show changes to 3 files +21 −3
cache.h, path.c, setup.c
diff --git a/cache.h b/cache.h index eab1a17..3465c94 100644 --- a/cache.h +++ b/cache.h @@ -524,6 +524,7 @@ static inline int is_absolute_path(const char *path) return path[0] == '/'; } const char *make_absolute_path(const char *path); +const char *make_relative_path(const char *abs, const char *base); /* Read and unpack a sha1 file into memory, write memory to a sha1 file */ extern int sha1_object_info(const unsigned char *, unsigned long *); diff --git a/path.c b/path.c index b7c24a2..8066bbc 100644 --- a/path.c +++ b/path.c @@ -294,6 +294,20 @@ int adjust_shared_perm(const char *path) /* We allow "recursive" symbolic links. Only within reason, though. */ #define MAXDEPTH 5 +const char *make_relative_path(const char *abs, const char *base) +{ + static char buf[PATH_MAX + 1]; + int baselen = strlen(base); + if (prefixcmp(abs, base)) + return abs; + if (abs[baselen] == '/') + baselen++; + else if (base[baselen - 1] != '/') + return abs; + strcpy(buf, abs + baselen); + return buf; +} + const char *make_absolute_path(const char *path) { static char bufs[2][PATH_MAX + 1], *buf = bufs[0], *next_buf = bufs[1]; diff --git a/setup.c b/setup.c index d630e37..a4ceae9 100644 --- a/setup.c +++ b/setup.c @@ -284,18 +284,21 @@ static const char *set_work_tree(const char *dir) void setup_work_tree(void) { - const char *work_tree, *git_dir; + const char *git_dir; + char *work_tree; static int initialized = 0; if (initialized) return; - work_tree = get_git_work_tree(); + work_tree = xstrdup(make_absolute_path(get_git_work_tree())); git_dir = get_git_dir(); if (!is_absolute_path(git_dir)) - set_git_dir(make_absolute_path(git_dir)); + set_git_dir(make_relative_path(make_absolute_path(git_dir), + work_tree)); if (!work_tree || chdir(work_tree)) die("This operation must be run in a work tree"); initialized = 1; + free(work_tree); } static int check_repository_format_gently(int *nongit_ok)
-- 1.5.4.5
