The ninteenth batch

[thirdparty/git.git] / transport-helper.c

diff --git a/transport-helper.c b/transport-helper.c
index dd6002b393738df81c7ecfc85deb4ed0abe4943c..8d284b24d5d5e79434932a12e38d06f15ac665da 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -1078,7 +1078,7 @@ static int push_refs_with_export(struct transport *transport,
        set_common_push_options(transport, data->name, flags);
        if (flags & TRANSPORT_PUSH_FORCE) {
                if (set_helper_option(transport, "force", "true") != 0)
-                       warning(_("helper %s does not support 'force'"), data->name);
+                       warning(_("helper %s does not support '--force'"), data->name);
        }
 
        helper = get_helper(transport);
@@ -1210,16 +1210,13 @@ static struct ref *get_refs_list_using_list(struct transport *transport,
        data->get_refs_list_called = 1;
        helper = get_helper(transport);
 
-       if (data->object_format) {
-               write_str_in_full(helper->in, "option object-format\n");
-               if (recvline(data, &buf) || strcmp(buf.buf, "ok"))
-                       exit(128);
-       }
+       if (data->object_format)
+               set_helper_option(transport, "object-format", "true");
 
        if (data->push && for_push)
-               write_str_in_full(helper->in, "list for-push\n");
+               write_constant(helper->in, "list for-push\n");
        else
-               write_str_in_full(helper->in, "list\n");
+               write_constant(helper->in, "list\n");
 
        while (1) {
                char *eov, *eon;