summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2012-09-09 08:19:44 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-12 11:46:31 -0700
commit5096e4875303038ffc34af96c28cf2a2b7e103a6 (patch)
tree0daa5e5c4abb35ebb95d5b383e57512d73e05253 /git-merge-one-file.sh
parentfilter_refs(): delete matched refs from sought list (diff)
downloadtgif-5096e4875303038ffc34af96c28cf2a2b7e103a6.tar.xz
filter_refs(): build refs list as we go
Instead of temporarily storing matched refs to temporary array "return_refs", simply append them to newlist as we go. This changes the order of references in newlist to strictly sorted if "--all" and "--depth" and named references are all specified, but that usage is broken anyway (see the last two tests in t5500). This changes the last test in t5500 from segfaulting into just emitting a spurious error (this will be fixed in a moment). Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions