Merge branch 'js/maint-remote-remove-mirror'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 03:40:41 +0000 (19:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 03:40:41 +0000 (19:40 -0800)
* js/maint-remote-remove-mirror:
  builtin-remote: make rm operation safer in mirrored repository
  builtin-remote: make rm() use properly named variable to hold return value

1  2 
builtin-remote.c
t/t5505-remote.sh

@@@ -539,11 -362,14 +549,14 @@@ static int rm(int argc, const char **ar
                OPT_END()
        };
        struct remote *remote;
 -      struct strbuf buf;
 +      struct strbuf buf = STRBUF_INIT;
        struct known_remotes known_remotes = { NULL, NULL };
        struct string_list branches = { NULL, 0, 0, 1 };
-       struct branches_for_remote cb_data = { NULL, &branches, &known_remotes };
-       int i;
+       struct string_list skipped = { NULL, 0, 0, 1 };
+       struct branches_for_remote cb_data = {
+               NULL, &branches, &skipped, &known_remotes
+       };
+       int i, result;
  
        if (argc != 2)
                usage_with_options(builtin_remote_usage, options);
Simple merge