Merge branch 'jc/format-patch-error-check'

diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index 1a25df7ee15b45df142679286afdb0e8c55647dc..1d7f1f5ce27834cafcf934db2085b36d4301e3c0 100644 (file)
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -88,18 +88,15 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
                int i;
                pattern = xcalloc(argc, sizeof(const char *));
                for (i = 1; i < argc; i++) {
-                       const char *glob;
                        pattern[i - 1] = xstrfmt("*/%s", argv[i]);
-
-                       glob = strchr(argv[i], '*');
-                       if (glob)
-                               argv_array_pushf(&ref_prefixes, "%.*s",
-                                                (int)(glob - argv[i]), argv[i]);
-                       else
-                               expand_ref_prefix(&ref_prefixes, argv[i]);
                }
        }
 
+       if (flags & REF_TAGS)
+               argv_array_push(&ref_prefixes, "refs/tags/");
+       if (flags & REF_HEADS)
+               argv_array_push(&ref_prefixes, "refs/heads/");
+
        remote = remote_get(dest);
        if (!remote) {
                if (dest)
@@ -151,6 +148,6 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
        }
 
        UNLEAK(sorting);
-       UNLEAK(ref_array);
+       ref_array_clear(&ref_array);
        return status;
 }