diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-12 15:09:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-12 15:09:57 -0800 |
| commit | 9b519609a625386f517545ab31de147ad6f433cb (patch) | |
| tree | bb1ab1d5e115b2447ed5d245f1180c3550b7dd94 /sha1_file.c | |
| parent | 62fe0eb4804c297486a1d421a4f893865fcbc911 (diff) | |
| parent | 37a95862c625e1d2ed2609e01b03950253ad4ff9 (diff) | |
| download | git-9b519609a625386f517545ab31de147ad6f433cb.tar.gz | |
Merge branch 'jk/alt-odb-cleanup' into jk/quote-env-path-list-component
* jk/alt-odb-cleanup:
alternates: re-allow relative paths from environment
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c index 064651947d..fbafdbed94 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -296,7 +296,7 @@ static int link_alt_odb_entry(const char *entry, const char *relative_base, } strbuf_addstr(&pathbuf, entry); - if (strbuf_normalize_path(&pathbuf) < 0) { + if (strbuf_normalize_path(&pathbuf) < 0 && relative_base) { error("unable to normalize alternate object path: %s", pathbuf.buf); strbuf_release(&pathbuf); |