summaryrefslogtreecommitdiff
path: root/parse-options.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-12 05:13:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-12 05:13:44 (GMT)
commitb85997d14d1873a4baa3d04966cd5947e6134acd (patch)
treeb21c76c4bc0d3fbb4221283334065216e17beff1 /parse-options.c
parentb81a7b58875e07d7e82aafced1de9834ba1ef94a (diff)
parent20a16eb33eee99fd3eab00c72f012b98d4eeee76 (diff)
downloadgit-b85997d14d1873a4baa3d04966cd5947e6134acd.zip
git-b85997d14d1873a4baa3d04966cd5947e6134acd.tar.gz
git-b85997d14d1873a4baa3d04966cd5947e6134acd.tar.bz2
Merge branch 'lt/unpack-trees'
* lt/unpack-trees: unpack_trees(): fix diff-index regression. traverse_trees_recursive(): propagate merge errors up unpack_trees(): minor memory leak fix in unused destination index Make 'unpack_trees()' have a separate source and destination index Make 'unpack_trees()' take the index to work on as an argument Add 'const' where appropriate to index handling functions Fix tree-walking compare_entry() in the presense of --prefix Move 'unpack_trees()' over to 'traverse_trees()' interface Make 'traverse_trees()' traverse conflicting DF entries in parallel Add return value to 'traverse_tree()' callback Make 'traverse_tree()' use linked structure rather than 'const char *base' Add 'df_name_compare()' helper function
Diffstat (limited to 'parse-options.c')
0 files changed, 0 insertions, 0 deletions