Merge branch 'ls/p4-retry-thrice'

diff --git a/sha1_file.c b/sha1_file.c
index 1eb47f61131a81b587dc4fe80e1b175f37ba0540..b5e827ac9e716db9fad69960058f1bf2fa50c9d3 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -284,7 +284,7 @@ static int link_alt_odb_entry(const char *entry, const char *relative_base,
        struct strbuf pathbuf = STRBUF_INIT;
 
        if (!is_absolute_path(entry) && relative_base) {
-               strbuf_addstr(&pathbuf, real_path(relative_base));
+               strbuf_realpath(&pathbuf, relative_base, 1);
                strbuf_addch(&pathbuf, '/');
        }
        strbuf_addstr(&pathbuf, entry);