diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-03-02 07:40:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-02 09:58:31 (GMT) |
| commit | e371a4c648e72673fcfdf0b45192857dd149e2f5 (patch) | |
| tree | 3c2e809b09ef02641e13880fc4491614f7c35275 | |
| parent | 2b459b483cb264d3e9a39cd7857da2ccab08179f (diff) | |
| download | git-e371a4c648e72673fcfdf0b45192857dd149e2f5.zip git-e371a4c648e72673fcfdf0b45192857dd149e2f5.tar.gz git-e371a4c648e72673fcfdf0b45192857dd149e2f5.tar.bz2 | |
Fix make_absolute_path() for parameters without a slash
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>
| -rw-r--r-- | path.c | 4 | ||||
| -rwxr-xr-x | t/t0000-basic.sh | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -311,8 +311,10 @@ const char *make_absolute_path(const char *path) if (last_slash) { *last_slash = '\0'; last_elem = xstrdup(last_slash + 1); - } else + } else { last_elem = xstrdup(buf); + *buf = '\0'; + } } if (*buf) { diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index 92de088..27b54cb 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -304,6 +304,8 @@ test_expect_success 'absolute path works as expected' ' test "$dir" = "$(test-absolute-path $dir2)" && file="$dir"/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 && sym="$(cd first; pwd -P)"/file && test "$sym" = "$(test-absolute-path $dir2/syml)" |