On Thu, Feb 27, 2014 at 4:00 AM, Carlos Martín Nieto <cmn@xxxxxxxx> wrote: > Subject: fetch: add a failing test for prunning with overlapping refspecs s/prunning/pruning/ > Signed-off-by: Carlos Martín Nieto <cmn@xxxxxxxx> > --- > diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh > index 1f0f8e6..4949e3d 100755 > --- a/t/t5510-fetch.sh > +++ b/t/t5510-fetch.sh > @@ -113,6 +113,26 @@ test_expect_success 'fetch --prune with a namespace keeps other namespaces' ' > git rev-parse origin/master > ' > > +test_expect_failure 'fetch --prune handles overlapping refspecs' ' > + cd "$D" && > + git update-ref refs/pull/42/head master && > + git clone . prune-overlapping && > + cd prune-overlapping && > + git config --add remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* && > + > + git fetch --prune origin && > + git rev-parse origin/master && > + git rev-parse origin/pr/42 && > + > + git config --unset-all remote.origin.fetch Broken &&-chain. > + git config remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* && > + git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* && > + > + git fetch --prune origin && > + git rev-parse origin/master && > + git rev-parse origin/pr/42 > +' > + > test_expect_success 'fetch --prune --tags does not delete the remote-tracking branches' ' > cd "$D" && > git clone . prune-tags && > -- > 1.9.0.rc3.244.g3497008 -- 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