Merge branch 'jp/completion-help-alias'

diff --git a/transport.c b/transport.c
index 3dfbc6a79c402bac5e18de97a12c131b556597c4..a02f79aae3d91ea4109d21a9ed9ca2d962125375 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -192,7 +192,7 @@ static const char *rsync_url(const char *url)
 static struct ref *get_refs_via_rsync(struct transport *transport, int for_push)
 {
        struct strbuf buf = STRBUF_INIT, temp_dir = STRBUF_INIT;
-       struct ref dummy = {0}, *tail = &dummy;
+       struct ref dummy = {NULL}, *tail = &dummy;
        struct child_process rsync;
        const char *args[5];
        int temp_dir_len;
@@ -1200,7 +1200,7 @@ int refs_from_alternate_cb(struct alternate_object_database *e, void *cb)
        alternate_ref_fn *ref_fn = cb;
 
        e->name[-1] = '\0';
-       other = xstrdup(make_absolute_path(e->base));
+       other = xstrdup(real_path(e->base));
        e->name[-1] = '/';
        len = strlen(other);