Merge branch 'master' of git://github.com/git-l10n/git-po

diff --git a/remote-curl.c b/remote-curl.c
index dd63bc27abf8ae4b9e480ba1bb88942db11a0e48..af7b6786dc091035e3216c710dbc0ebc3c234a8a 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -567,7 +567,6 @@ static int post_rpc(struct rpc_state *rpc)
                git_zstream stream;
                int ret;
 
-               memset(&stream, 0, sizeof(stream));
                git_deflate_init_gzip(&stream, Z_BEST_COMPRESSION);
                gzip_size = git_deflate_bound(&stream, rpc->len);
                gzip_body = xmalloc(gzip_size);
@@ -760,7 +759,7 @@ static int fetch_git(struct discovery *heads,
 
        for (i = 0; i < nr_heads; i++) {
                struct ref *ref = to_fetch[i];
-               if (!ref->name || !*ref->name)
+               if (!*ref->name)
                        die("cannot fetch by sha1 over smart http");
                packet_buf_write(&preamble, "%s %s\n",
                                 sha1_to_hex(ref->old_sha1), ref->name);
@@ -962,6 +961,8 @@ int main(int argc, const char **argv)
        struct strbuf buf = STRBUF_INIT;
        int nongit;
 
+       git_setup_gettext();
+
        git_extract_argv0_path(argv[0]);
        setup_git_directory_gently(&nongit);
        if (argc < 2) {