diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-11-10 21:17:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-10 21:17:30 (GMT) |
| commit | 0538b84027a8aba7e8b805e3ec8fceb3990023e5 (patch) | |
| tree | e9e2323b28d0eb1c7a3129c07e07d6e2a3c9f08c /sha1_file.c | |
| parent | 7b2c338caef2c44e3d1d58ebf5fda1722f5c5daa (diff) | |
| parent | 37a95862c625e1d2ed2609e01b03950253ad4ff9 (diff) | |
| download | git-0538b84027a8aba7e8b805e3ec8fceb3990023e5.zip git-0538b84027a8aba7e8b805e3ec8fceb3990023e5.tar.gz git-0538b84027a8aba7e8b805e3ec8fceb3990023e5.tar.bz2 | |
Merge branch 'jk/alt-odb-cleanup'
Fix a corner-case regression in a topic that graduated during the
v2.11 cycle.
* 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 5457314..9c86d19 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); |