diffcore-rename: refactor "too many candidates" logic

diff --git a/transport.c b/transport.c
index 4dba6f8815a80093a8ac9edc226d99bba1bb6394..f1c07816e01bb0b1ad93d7665b1374e8cd36e6cb 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;
@@ -789,6 +789,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
        args.use_thin_pack = data->options.thin;
        args.verbose = (transport->verbose > 0);
        args.quiet = (transport->verbose < 0);
+       args.progress = transport->progress;
        args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN);
        args.porcelain = !!(flags & TRANSPORT_PUSH_PORCELAIN);