summaryrefslogtreecommitdiffstats
path: root/match-trees.c
AgeCommit message (Expand)AuthorLines
2022-02-25object-file API: have write_object_file() take "enum object_type"Ævar Arnfjörð Bjarmason-1/+1
2021-04-27Always use oidread to read into struct object_idbrian m. carlson-1/+1
2019-06-27match-trees.c: remove the_repo from shift_tree*()Nguyễn Thái Ngọc Duy-5/+7
2019-06-27tree-walk.c: remove the_repo from get_tree_entry()Nguyễn Thái Ngọc Duy-3/+3
2019-04-08Use 'unsigned short' for mode, like diff_filespec doesElijah Newren-4/+4
2019-02-06Merge branch 'jk/unused-parameter-cleanup'Junio C Hamano-9/+7
2019-01-24match-trees: drop unused path parameter from score functionsJeff King-9/+7
2019-01-15tree-walk: store object_id in a separate memberbrian m. carlson-1/+1
2019-01-15match-trees: use hashcpy to splice treesbrian m. carlson-6/+18
2019-01-15match-trees: compute buffer offset correctly when splicingbrian m. carlson-3/+4
2018-08-29convert "oidcmp() != 0" to "!oideq()"Jeff King-1/+1
2018-08-17Merge branch 'jk/merge-subtree-heuristics'Junio C Hamano-17/+26
2018-08-02score_trees(): fix iteration over trees with missing entriesJeff King-17/+26
2018-05-16object-store: move object access functions to object-store.hStefan Beller-0/+1
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson-2/+2
2018-03-14tree-walk: convert tree entry functions to object_idbrian m. carlson-3/+3
2018-01-30sha1_file: convert write_sha1_file to object_idPatryk Obara-1/+1
2018-01-30match-trees: convert splice_tree to object_idPatryk Obara-24/+22
2016-04-25match-trees: convert several leaf functions to use struct object_idbrian m. carlson-15/+15
2016-04-25tree-walk: convert tree_entry_extract() to use struct object_idbrian m. carlson-6/+6
2016-04-25struct name_entry: use struct object_id instead of unsigned char sha1[20]brian m. carlson-1/+1
2016-04-19match-trees: convert shift_tree() and shift_tree_by() to use object_idbrian m. carlson-22/+22
2014-06-19use xstrfmt to replace xmalloc + sprintfJeff King-7/+2
2014-03-10use strchrnul() in place of strchr() and strlen()Rohit Mani-7/+4
2013-06-13match-trees: factor out fill_tree_desc_strictRené Scharfe-25/+19
2013-03-25match-trees: simplify score_trees() using tree_entry()René Scharfe-40/+28
2010-01-17Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano-1/+68
2007-10-21Improved const correctness for stringsShawn O. Pearce-1/+1
2007-06-07War on whitespaceJunio C Hamano-1/+0
2007-04-07A new merge stragety 'subtree'.Junio C Hamano-0/+304