From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Feb 2009 03:40:41 +0000 (-0800)
Subject: Merge branch 'js/maint-remote-remove-mirror'
X-Git-Tag: v1.6.2-rc0~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ba743d1b0ce0b44c797c0de06c9db2781e4d1fdd;p=git.git

Merge branch 'js/maint-remote-remove-mirror'

* 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
---

ba743d1b0ce0b44c797c0de06c9db2781e4d1fdd
diff --cc builtin-remote.c
index abc8dd838,07cfdac46..db18bcfc9
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@@ -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);