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

Fix make_absolute_path() for parameters without a slash

Browse Source 
When passing "xyz" to make_absolute_path(), make_absolute_path()
erroneously tried to chdir("xyz"), and then append "/xyz".  Instead,
skip the chdir() completely when no slash was found.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2008-03-02 07:40:33 +00:00 committed by Junio C Hamano
parent 2b459b483c
commit e371a4c648
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
path.c
View File

@ -311,8 +311,10 @@ const char *make_absolute_path(const char *path)
if (last_slash) { if (last_slash) {
*last_slash = '\0'; *last_slash = '\0';
last_elem = xstrdup(last_slash + 1); last_elem = xstrdup(last_slash + 1);
} else } else {
last_elem = xstrdup(buf); last_elem = xstrdup(buf);
*buf = '\0';
}
} }
if (*buf) { if (*buf) {

2
t/t0000-basic.sh
View File

@ -304,6 +304,8 @@ test_expect_success 'absolute path works as expected' '
test "$dir" = "$(test-absolute-path $dir2)" && test "$dir" = "$(test-absolute-path $dir2)" &&
file="$dir"/index && file="$dir"/index &&
test "$file" = "$(test-absolute-path $dir2/index)" && test "$file" = "$(test-absolute-path $dir2/index)" &&
basename=blub &&
test "$dir/$basename" = $(cd .git && test-absolute-path $basename) &&
ln -s ../first/file .git/syml && ln -s ../first/file .git/syml &&
sym="$(cd first; pwd -P)"/file && sym="$(cd first; pwd -P)"/file &&
test "$sym" = "$(test-absolute-path $dir2/syml)" test "$sym" = "$(test-absolute-path $dir2/syml)"