summaryrefslogtreecommitdiff
path: root/builtin/remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-31 19:08:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-31 19:08:52 (GMT)
commit2cd517cdd3f52bcfb5a87e6991560cc000b11089 (patch)
tree40ae945ca7f062da8abe6e5861fd44f78db422cf /builtin/remote.c
parentefd02e92c9961063bae63da7f7446868a38f14ce (diff)
parent3eafdc961fa6c44d40382be6a55b62b7e6edb248 (diff)
downloadgit-2cd517cdd3f52bcfb5a87e6991560cc000b11089.zip
git-2cd517cdd3f52bcfb5a87e6991560cc000b11089.tar.gz
git-2cd517cdd3f52bcfb5a87e6991560cc000b11089.tar.bz2
Merge branch 'jk/maint-remote-mirror-safer'
* jk/maint-remote-mirror-safer: remote: allow "-t" with fetch mirrors
Diffstat (limited to 'builtin/remote.c')
-rw-r--r--builtin/remote.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/remote.c b/builtin/remote.c
index 8424152..9ff1cac 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -193,8 +193,8 @@ static int add(int argc, const char **argv)
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");
+ if (mirror && !(mirror & MIRROR_FETCH) && track.nr)
+ die("specifying branches to track makes sense only with fetch mirrors");
name = argv[0];
url = argv[1];