1/3 should be pretty sane, just adding a warning in documentation and 'git remote add' about overlapping refspecs. 2/3 only makes sense if 3/3 is accepted, as it's a test for that change. 3/3 I'm not 100% sure about, though the approach feels reasonably ok. It changes get_stale_heads to also detect overlapping refspecs and abort any prune action if it finds them. What I'm not sure about is whether this is the right place to do it, or to do it in the callers of get_stale_heads and exit(1) in this situation. Both 1/3 and 3/3 ignore exactly matching refspecs, as that's a supported thing already, another test in t5505 broke before I made both ignore exactly matching refspecs. Dennis Kaarsemaker (3): remote: Add warnings about mixin --mirror and other remotes remote: Add test for prune and mixed --mirror and normal remotes remote: don't prune when detecting overlapping refspecs Documentation/git-remote.txt | 6 +++++- builtin/remote.c | 17 +++++++++++++++++ remote.c | 23 +++++++++++++++++++++++ t/t5505-remote.sh | 9 +++++++++ 4 files changed, 54 insertions(+), 1 deletion(-) -- 1.8.3.1-619-gbec0aa7 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html