builtin-rm: use warning() instead of fprintf(stderr, "warning: ")

diff --git a/builtin-ls-remote.c b/builtin-ls-remote.c
index c2caeeabe2f9d2bce190656a58094b5ebeee4e30..78a88f74769645f0be86aa77d3dee3f5e99c916f 100644 (file)
--- a/builtin-ls-remote.c
+++ b/builtin-ls-remote.c
@@ -4,7 +4,7 @@
 #include "remote.h"
 
 static const char ls_remote_usage[] =
-"git-ls-remote [--upload-pack=<git-upload-pack>] [<host>:]<directory>";
+"git ls-remote [--heads] [--tags]  [-u <exec> | --upload-pack <exec>] <repository> <refs>...";
 
 /*
  * Is there one among the list of patterns that match the tail part
@@ -31,7 +31,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 {
        int i;
        const char *dest = NULL;
-       int nongit = 0;
+       int nongit;
        unsigned flags = 0;
        const char *uploadpack = NULL;
        const char **pattern = NULL;
@@ -54,11 +54,11 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
                                uploadpack = arg + 7;
                                continue;
                        }
-                       if (!strcmp("--tags", arg)) {
+                       if (!strcmp("--tags", arg) || !strcmp("-t", arg)) {
                                flags |= REF_TAGS;
                                continue;
                        }
-                       if (!strcmp("--heads", arg)) {
+                       if (!strcmp("--heads", arg) || !strcmp("-h", arg)) {
                                flags |= REF_HEADS;
                                continue;
                        }
@@ -94,10 +94,8 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
                transport_set_option(transport, TRANS_OPT_UPLOADPACK, uploadpack);
 
        ref = transport_get_remote_refs(transport);
-
-       if (!ref)
+       if (transport_disconnect(transport))
                return 1;
-
        for ( ; ref; ref = ref->next) {
                if (!check_ref_type(ref, flags))
                        continue;