diff options
| author | Johannes Sixt <johannes.sixt@telecom.at> | 2008-07-21 21:19:55 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-25 17:41:13 -0700 |
| commit | 10c4c881c4d2cb0ece0508e7142e189e68445257 (patch) | |
| tree | 32a3cc326352f5a1244144a987b8659b6fcc2bc5 /exec_cmd.c | |
| parent | 49fa65a7a8185e81c1098815df607042103b0493 (diff) | |
| download | git-10c4c881c4d2cb0ece0508e7142e189e68445257.tar.gz | |
Allow add_path() to add non-existent directories to the path
This function had used make_absolute_path(); but this function dies if
the directory that contains the entry whose relative path was supplied in
the argument does not exist. This is a problem if the argument is, for
example, "../libexec/git-core", and that "../libexec" does not exist.
Since the resolution of symbolic links is not required for elements in
PATH, we can fall back to using make_nonrelative_path(), which simply
prepends $PWD to the path.
We have to move make_nonrelative_path() alongside make_absolute_path() in
abspath.c so that git-shell can be linked. See 5b8e6f85f.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'exec_cmd.c')
| -rw-r--r-- | exec_cmd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/exec_cmd.c b/exec_cmd.c index c23603452e..0ed768ddc0 100644 --- a/exec_cmd.c +++ b/exec_cmd.c @@ -50,7 +50,7 @@ static void add_path(struct strbuf *out, const char *path) if (is_absolute_path(path)) strbuf_addstr(out, path); else - strbuf_addstr(out, make_absolute_path(path)); + strbuf_addstr(out, make_nonrelative_path(path)); strbuf_addch(out, PATH_SEP); } |