summaryrefslogtreecommitdiff
path: root/mergetools/tortoisemerge
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2012-02-11 07:20:59 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-12 19:50:39 -0800
commitf2576591320f6296d341fa14bd50ba6918ced864 (patch)
treeb8a31c1b180a9b3fcf7b85f888597f10bef5ed11 /mergetools/tortoisemerge
parentfetch-pack.c: inline insert_alternate_refs() (diff)
downloadtgif-f2576591320f6296d341fa14bd50ba6918ced864.tar.xz
everything_local(): mark alternate refs as complete
Objects in an alternate object database are already available to the local repository and therefore don't need to be fetched. So mark them as complete in everything_local(). This fixes a test in t5700. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions