| commit | 400ecca8c10520ced800b4fcdd5bdeb94bd2a556 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 3 Apr 2014 19:38:18 +0000 (3 12:38 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 3 Apr 2014 19:38:18 +0000 (3 12:38 -0700) | ||
| tree | 7481b93198f9d9ac749f55b104a87e5f44ae4d65 | treesnapshot (tar.gz zip) |
| parent | b407d40933f9c37af16ca3dc275e615ab4fdd8c5 | commitdiff |
| parent | e6f637122ecd60c59df27b8188b6ddac39ac0063 | commitdiff |
Merge branch 'cn/fetch-prune-overlapping-destination'
Protect refs in a hierarchy that can come from more than one remote
hierarcies from incorrect removal by "git fetch --prune".
* cn/fetch-prune-overlapping-destination:
fetch: handle overlaping refspecs on --prune
fetch: add a failing test for prunning with overlapping refspecs
Protect refs in a hierarchy that can come from more than one remote
hierarcies from incorrect removal by "git fetch --prune".
* cn/fetch-prune-overlapping-destination:
fetch: handle overlaping refspecs on --prune
fetch: add a failing test for prunning with overlapping refspecs
| remote.c | diff1 | diff2 | blobhistory |
| t/t5510-fetch.sh | diff1 | diff2 | blobhistory |