Merge branch 'cn/fetch-prune-overlapping-destination' into maint
commitfbae3d9ace0b71f8db62cde127fa6fe24c40380c
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Apr 2014 19:02:41 +0000 (9 12:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Apr 2014 19:02:41 +0000 (9 12:02 -0700)
treee21a4680776b2aed597dc95286769ca495aa3c36
parentaba7af8e67664f60b432ae1760644f9e96470949
parente6f637122ecd60c59df27b8188b6ddac39ac0063
Merge branch 'cn/fetch-prune-overlapping-destination' into maint

* cn/fetch-prune-overlapping-destination:
  fetch: handle overlaping refspecs on --prune
  fetch: add a failing test for prunning with overlapping refspecs
remote.c
t/t5510-fetch.sh