This is the third of a series of patches to convert instances of unsigned char[20] to struct object_id. The focus in this series was to convert test-match-trees, related functions, and some dependencies. struct name_entry was converted as part of these dependencies.
The riskiest part of this series is the conversion of struct name_entry. Compatibility with unconverted code requires dereferencing the new oid member, but there are at least some places where we explicitly check that it is not NULL. Most of these are protected by a check for a nonzero mode. This series rebases onto next cleanly and is not likely to conflict with other topics in flight. My intention is to send smaller series more frequently, with the goal of avoiding or minimizing conflicts where possible. Changes from v1: * Remove dereference of object_id pointer in boolean context. brian m. carlson (6): Introduce a get_oid function. test-match-trees: convert to use struct object_id match-trees: convert shift_tree and shift_tree_by to object_id Convert struct name_entry to use struct object_id. tree-walk: convert tree_entry_extract to struct object_id match-trees: convert several leaf functions to struct object_id builtin/grep.c | 6 ++--- builtin/merge-tree.c | 18 +++++++-------- builtin/pack-objects.c | 4 ++-- builtin/reflog.c | 4 ++-- cache-tree.c | 4 ++-- cache.h | 6 +++-- fsck.c | 10 ++++----- http-push.c | 4 ++-- list-objects.c | 6 ++--- match-trees.c | 60 +++++++++++++++++++++++++------------------------- merge-recursive.c | 4 ++-- notes.c | 4 ++-- revision.c | 4 ++-- sha1_name.c | 9 ++++++++ test-match-trees.c | 14 ++++++------ tree-diff.c | 8 +++---- tree-walk.c | 16 +++++++------- tree-walk.h | 8 +++---- tree.c | 10 ++++----- unpack-trees.c | 4 ++-- walker.c | 4 ++-- 21 files changed, 109 insertions(+), 98 deletions(-) -- 2.8.1.369.geae769a -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
