remote: deprecate --mirror
The configuration created by plain --mirror is dangerous and useless, and we now have --mirror=fetch and --mirror=push to replace it. Let's warn the user. One alternative to this is to try to guess which type the user wants. In a non-bare repository, a fetch mirror doesn't make much sense, since it would overwrite local commits. But in a bare repository, you might use either type, or even both (e.g., if you are acting as an intermediate drop-point across two disconnected networks). So rather than try for complex heuristics, let's keep it simple. The user knows what they're trying to do, so let them tell us. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Mar 30, 2011 at 15:53 UTC
099024861021830f9d4c7db4c64c844bf9d5ebd9
2 files changed
+7
-5
Documentation/git-remote.txt
-4
@@ -75,10 +75,6 @@ because a fetch would overwrite any local commits.
75
+
76
When a push mirror is created with `\--mirror=push`, then `git push`
77
will always behave as if `\--mirror` was passed.
78
-+
79
-The option `\--mirror` (with no type) sets up both push and fetch
80
-mirror configuration. It is kept for historical purposes, and is
81
-probably not what you want.
78
79
'rename'::
80
builtin/remote.c
+7
-1
@@ -136,13 +136,19 @@ static int add_branch(const char *key, const char *branchname,
136
return git_config_set_multivar(key, tmp->buf, "^$", 0);
137
}
138
139
+static const char mirror_advice[] =
140
+"--mirror is dangerous and deprecated; please\n"
141
+"\t use --mirror=fetch or --mirror=push instead";
142
+
143
static int parse_mirror_opt(const struct option *opt, const char *arg, int not)
144
{
145
unsigned *mirror = opt->value;
146
if (not)
147
*mirror = MIRROR_NONE;
144
- else if (!arg)
148
+ else if (!arg) {
149
+ warning("%s", mirror_advice);
150
*mirror = MIRROR_BOTH;
151
+ }
152
else if (!strcmp(arg, "fetch"))
153
*mirror = MIRROR_FETCH;
154
else if (!strcmp(arg, "push"))