summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2017-05-01 02:28:59 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-02 10:46:41 +0900
commitb8607f35b180a00b3f3240ff7d26d034a83fb23a (patch)
treed3a675540509817138c652f49ce8855c6b696627 /builtin/merge-ours.c
parentbuiltin/prune: convert to struct object_id (diff)
downloadtgif-b8607f35b180a00b3f3240ff7d26d034a83fb23a.tar.xz
bundle: convert to struct object_id
Convert the bundle code, plus the sole external user of struct ref_list_entry, to use struct object_id. Include cache.h from within bundle.h to provide the definition. Convert some of the hash parsing code to use parse_oid_hex to avoid needing to hard-code constant values. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions