From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 May 2011 19:08:52 +0000 (-0700)
Subject: Merge branch 'jk/maint-remote-mirror-safer'
X-Git-Tag: v1.7.6-rc0~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2cd517cdd3f52bcfb5a87e6991560cc000b11089?ds=inline;hp=-c

Merge branch 'jk/maint-remote-mirror-safer'

* jk/maint-remote-mirror-safer:
remote: allow "-t" with fetch mirrors
---

2cd517cdd3f52bcfb5a87e6991560cc000b11089
diff --combined builtin/remote.c
index 8424152269,aa7111824d..9ff1cac69b
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@@ -1,4 -1,4 +1,4 @@@
 -#include "cache.h"
 +#include "builtin.h"
  #include "parse-options.h"
  #include "transport.h"
  #include "remote.h"
@@@ -193,8 -193,8 +193,8 @@@ static int add(int argc, const char **a
  
  	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];