summaryrefslogtreecommitdiff
path: root/match-trees.c
AgeCommit message (Expand)AuthorFilesLines
2019-01-15tree-walk: store object_id in a separate memberLibravatar brian m. carlson1-1/+1
2019-01-15match-trees: use hashcpy to splice treesLibravatar brian m. carlson1-6/+18
2019-01-15match-trees: compute buffer offset correctly when splicingLibravatar brian m. carlson1-3/+4
2018-08-29convert "oidcmp() != 0" to "!oideq()"Libravatar Jeff King1-1/+1
2018-08-17Merge branch 'jk/merge-subtree-heuristics'Libravatar Junio C Hamano1-17/+26
2018-08-02score_trees(): fix iteration over trees with missing entriesLibravatar Jeff King1-17/+26
2018-05-16object-store: move object access functions to object-store.hLibravatar Stefan Beller1-0/+1
2018-03-14sha1_file: convert read_sha1_file to struct object_idLibravatar brian m. carlson1-2/+2
2018-03-14tree-walk: convert tree entry functions to object_idLibravatar brian m. carlson1-3/+3
2018-01-30sha1_file: convert write_sha1_file to object_idLibravatar Patryk Obara1-1/+1
2018-01-30match-trees: convert splice_tree to object_idLibravatar Patryk Obara1-24/+22
2016-04-25match-trees: convert several leaf functions to use struct object_idLibravatar brian m. carlson1-15/+15
2016-04-25tree-walk: convert tree_entry_extract() to use struct object_idLibravatar brian m. carlson1-6/+6
2016-04-25struct name_entry: use struct object_id instead of unsigned char sha1[20]Libravatar brian m. carlson1-1/+1
2016-04-19match-trees: convert shift_tree() and shift_tree_by() to use object_idLibravatar brian m. carlson1-22/+22
2014-06-19use xstrfmt to replace xmalloc + sprintfLibravatar Jeff King1-7/+2
2014-03-10use strchrnul() in place of strchr() and strlen()Libravatar Rohit Mani1-7/+4
2013-06-13match-trees: factor out fill_tree_desc_strictLibravatar René Scharfe1-25/+19
2013-03-25match-trees: simplify score_trees() using tree_entry()Libravatar René Scharfe1-40/+28
2010-01-17Make "subtree" part more orthogonal to the rest of merge-recursive.Libravatar Junio C Hamano1-1/+68
2007-10-21Improved const correctness for stringsLibravatar Shawn O. Pearce1-1/+1
2007-06-07War on whitespaceLibravatar Junio C Hamano1-1/+0
2007-04-07A new merge stragety 'subtree'.Libravatar Junio C Hamano1-0/+304