summaryrefslogtreecommitdiff
path: root/merge-blobs.h
diff options
context:
space:
mode:
authorLibravatar Carlos Martín Nieto <cmn@dwim.me>2014-02-27 10:00:10 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-26 12:57:52 -0700
commite6f637122ecd60c59df27b8188b6ddac39ac0063 (patch)
tree444fa9d30b7ef7905e4dce9006ae03ac40dc22ee /merge-blobs.h
parentfetch: add a failing test for prunning with overlapping refspecs (diff)
downloadtgif-e6f637122ecd60c59df27b8188b6ddac39ac0063.tar.xz
fetch: handle overlaping refspecs on --prune
We need to consider that a remote-tracking branch may match more than one rhs of a fetch refspec. In such a case, it is not enough to stop at the first match but look at all of the matches in order to determine whether a head is stale. To this goal, introduce a variant of query_refspecs which returns all of the matching refspecs and loop over those answers to check for staleness. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-blobs.h')
0 files changed, 0 insertions, 0 deletions