git remote update: Report error for non-existing groups

Previosly, git remote update <non-existing-group> would just silently fail
and do nothing. Now it will report an error saying that the group does
not exist.

Signed-off-by: Finn Arne Gangstad <finnag@pvv.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-remote.c b/builtin-remote.c
index 3146eb467d2c179867bfbcf12b690d07468c0534..51df99ba930c47c1163cdc3399f27d2a69c29a93 100644 (file)
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -1188,16 +1188,18 @@ struct remote_group {
        struct string_list *list;
 } remote_group;
 
        struct string_list *list;
 } remote_group;
 

-static int get_remote_group(const char *key, const char *value, void *cb)
+static int get_remote_group(const char *key, const char *value, void *num_hits)

 {
        if (!prefixcmp(key, "remotes.") &&
                        !strcmp(key + 8, remote_group.name)) {
                /* split list by white space */
                int space = strcspn(value, " \t\n");
                while (*value) {
 {
        if (!prefixcmp(key, "remotes.") &&
                        !strcmp(key + 8, remote_group.name)) {
                /* split list by white space */
                int space = strcspn(value, " \t\n");
                while (*value) {

-                       if (space > 1)
+                       if (space > 1) {

                                string_list_append(xstrndup(value, space),
                                                remote_group.list);
                                string_list_append(xstrndup(value, space),
                                                remote_group.list);

+                               ++*((int *)num_hits);
+                       }

                        value += space + (value[space] != '\0');
                        space = strcspn(value, " \t\n");
                }
                        value += space + (value[space] != '\0');
                        space = strcspn(value, " \t\n");
                }


@@ -1227,8 +1229,11 @@ static int update(int argc, const char **argv)
 
        remote_group.list = &list;
        for (i = 1; i < argc; i++) {
 
        remote_group.list = &list;
        for (i = 1; i < argc; i++) {

+               int groups_found = 0;

                remote_group.name = argv[i];
                remote_group.name = argv[i];

-               result = git_config(get_remote_group, NULL);
+               result = git_config(get_remote_group, &groups_found);
+               if (!groups_found && (i != 1 || strcmp(argv[1], "default")))
+                       die("No such remote group: '%s'", argv[i]);

        }
 
        if (!result && !list.nr  && argc == 2 && !strcmp(argv[1], "default"))
        }
 
        if (!result && !list.nr  && argc == 2 && !strcmp(argv[1], "default"))