[PATCH v2 00/20] object_id part 5
- From
brian m. carlson <sandals@crustytoothpaste.net>
- Date
- Sep 5, 2016, 20:07 UTC
- Message-ID
- <20160905200811.697889-1-sandals@crustytoothpaste.net>
This is the fifth in a series of series to convert from unsigned char [20] to struct object_id.
This series converts many of the files in the builtin directory to use struct object_id. This gets us almost to the point where we can convert get_tree_entry to use struct object_id, but not quite. That function is used indirectly by get_sha1, meaning that get_oid would have to completely replace it in order for get_tree_entry to be converted.
However, this series tackles one of two major sources of object ID values: the command line (the other, of course, being the refs code). Converting several of the builtin commands to use struct object_id as much as possible makes it easier to convert other functions down the line.
Changes from v1: * More clearly state that the Coccinelle-using patches also have a manual struct update. * Convert the uninitialized constant in notes-merge.c. * Convert one additional use of update_ref into update_ref_oid.
brian m. carlson (20): cache: convert struct cache_entry to use struct object_id builtin/apply: convert static functions to struct object_id builtin/blame: convert struct origin to use struct object_id builtin/log: convert some static functions to use struct object_id builtin/cat-file: convert struct expand_data to use struct object_id builtin/cat-file: convert some static functions to struct object_id builtin: convert textconv_object to use struct object_id streaming: make stream_blob_to_fd take struct object_id builtin/checkout: convert some static functions to struct object_id notes-merge: convert struct notes_merge_pair to struct object_id Convert read_mmblob to take struct object_id. builtin/blame: convert file to use struct object_id builtin/rm: convert to use struct object_id notes: convert init_notes to use struct object_id builtin/update-index: convert file to struct object_id sha1_name: convert get_sha1_mb to struct object_id refs: add an update_ref_oid function. builtin/am: convert to struct object_id builtin/commit-tree: convert to struct object_id builtin/reset: convert to use struct object_id
builtin.h | 2 +- builtin/am.c | 140 +++++++++++++++++++-------------------- builtin/apply.c | 94 +++++++++++++------------- builtin/blame.c | 76 ++++++++++----------- builtin/cat-file.c | 70 ++++++++++---------- builtin/checkout.c | 70 ++++++++++---------- builtin/commit-tree.c | 20 +++--- builtin/fsck.c | 4 +- builtin/grep.c | 3 +- builtin/log.c | 44 ++++++------ builtin/ls-files.c | 2 +- builtin/merge-index.c | 2 +- builtin/read-tree.c | 2 +- builtin/reset.c | 52 +++++++-------- builtin/rm.c | 18 ++--- builtin/submodule--helper.c | 5 +- builtin/update-index.c | 67 ++++++++++--------- cache-tree.c | 4 +- cache.h | 4 +- diff-lib.c | 31 +++++---- diff.c | 2 +- dir.c | 7 +- entry.c | 9 +-- merge-recursive.c | 8 +-- notes-merge.c | 127 ++++++++++++++++++----------------- notes.c | 12 ++-- read-cache.c | 24 +++---- refs.c | 8 +++ refs.h | 3 + rerere.c | 3 +- resolve-undo.c | 2 +- revision.c | 2 +- sha1_name.c | 20 +++--- streaming.c | 4 +- streaming.h | 2 +- t/helper/test-dump-split-index.c | 2 +- tree.c | 2 +- unpack-trees.c | 8 +-- xdiff-interface.c | 8 +-- xdiff-interface.h | 3 +- 40 files changed, 497 insertions(+), 469 deletions(-)