Merge branch 'maint-1.9' into maint-2.0

diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index 3e9eefb0915a4496ead9ddbf3836a4455351dba0..b2a4b92992748ab52fc6fd3f31041dd88dca54f8 100644 (file)
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -92,7 +92,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 
        if (argv[i]) {
                int j;
-               pattern = xcalloc(sizeof(const char *), argc - i + 1);
+               pattern = xcalloc(argc - i + 1, sizeof(const char *));
                for (j = i; j < argc; j++) {
                        int len = strlen(argv[j]);
                        char *p = xmalloc(len + 3);