diff --git a/builtin/remote.c b/builtin/remote.c
index cb26080956077f8c9ae02c91ffdc341293a4f9f1..952be2e27bc32026ef0af61f14ebd5d9102d2c85 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
if (argc < 2)
usage_with_options(builtin_remote_add_usage, options);
+ if (mirror && master)
+ die("specifying a master branch makes no sense with --mirror");
+ if (mirror && track.nr)
+ die("specifying branches to track makes no sense with --mirror");
+
name = argv[0];
url = argv[1];