Merge branch 'rc/histogram-diff' into HEAD

diff --git a/builtin/remote.c b/builtin/remote.c
index 82cd59e303b51a58440211511bc757dd1599765c..05b1f5b76de36b19ef4bebba32aff1b40cbc2030 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -183,8 +183,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];