aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-05-02 13:11:02 -0700
committerJunio C Hamano <gitster@pobox.com>2014-05-02 13:11:03 -0700
commit648d9c182723862228065686f2c32c4b6bdcdf5e (patch)
tree749b5d52e00ea14de300eccfc296ee50d6086204
parent06229a6ee09dc82e75b3c2442ff6fbb1d6fbbe3a (diff)
parent6127ff63cf39471b2c7317c9861016424d3b884b (diff)
downloadgit-648d9c182723862228065686f2c32c4b6bdcdf5e.tar.gz
git-648d9c182723862228065686f2c32c4b6bdcdf5e.tar.xz
Merge branch 'mw/symlinks'
A finishing touch fix to a new change already in 'master'. * mw/symlinks: setup: fix windows path buffer over-stepping
-rw-r--r--setup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/setup.c b/setup.c
index 613e3b3c1..0a22f8bd1 100644
--- a/setup.c
+++ b/setup.c
@@ -29,7 +29,7 @@ static int abspath_part_inside_repo(char *path)
return -1;
wtlen = strlen(work_tree);
len = strlen(path);
- off = 0;
+ off = offset_1st_component(path);
/* check if work tree is already the prefix */
if (wtlen <= len && !strncmp(path, work_tree, wtlen)) {
@@ -45,7 +45,7 @@ static int abspath_part_inside_repo(char *path)
off = wtlen;
}
path0 = path;
- path += offset_1st_component(path) + off;
+ path += off;
/* check each '/'-terminated level */
while (*path) {