Merge branch 'jc/exclusion-doc'

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 55919a9e4fb8e2fd538b6c111bfdacf83acf62ed..e4639d8eb1d5fda586520f10271c05a0897f2ea5 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1022,10 +1022,9 @@ static int add_remote_or_group(const char *name, struct string_list *list)
 
        git_config(get_remote_group, &g);
        if (list->nr == prev_nr) {
-               struct remote *remote;
-               if (!remote_is_configured(name))
+               struct remote *remote = remote_get(name);
+               if (!remote_is_configured(remote))
                        return 0;
-               remote = remote_get(name);
                string_list_append(list, remote->name);
        }
        return 1;
@@ -1116,7 +1115,7 @@ static int fetch_one(struct remote *remote, int argc, const char **argv)
        if (argc > 0) {
                int j = 0;
                int i;
-               refs = xcalloc(argc + 1, sizeof(const char *));
+               refs = xcalloc(st_add(argc, 1), sizeof(const char *));
                for (i = 0; i < argc; i++) {
                        if (!strcmp(argv[i], "tag")) {
                                i++;