git/cache-tree.c, branch v2.18.2

cache-tree: use is_empty_tree_oid

2018-05-02T04:59:52Z

When comparing an object ID against that of the empty tree, use the is_empty_tree_oid function to ensure that we abstract over the hash algorithm properly. In addition, this is more readable than a plain oidcmp. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

cache: add a function to read an object ID from a buffer

2018-05-02T04:59:48Z

In various places throughout the codebase, we need to read data into a struct object_id from a pack or other unsigned char buffer. Add an inline function that does this based on the current hash algorithm in use, and use it in several places. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

cache-tree: convert remnants to struct object_id

2018-03-14T16:23:47Z

Convert the remaining portions of cache-tree.c to use struct object_id. Convert several instances of 20 to use the_hash_algo instead. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

cache-tree: convert write_*_as_tree to object_id

2018-03-14T16:23:47Z

Convert write_index_as_tree and write_cache_as_tree to use struct object_id. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

Merge branch 'po/object-id'

2018-02-15T22:55:43Z

Conversion from uchar[20] to struct object_id continues. * po/object-id: sha1_file: rename hash_sha1_file_literally sha1_file: convert write_loose_object to object_id sha1_file: convert force_object_loose to object_id sha1_file: convert write_sha1_file to object_id notes: convert write_notes_tree to object_id notes: convert combine_notes_* to object_id commit: convert commit_tree* to object_id match-trees: convert splice_tree to object_id cache: clear whole hash buffer with oidclr sha1_file: convert hash_sha1_file to object_id dir: convert struct sha1_stat to use object_id sha1_file: convert pretend_sha1_file to object_id

Merge branch 'sg/cocci-move-array'

2018-02-13T21:39:13Z

Code clean-up. * sg/cocci-move-array: Use MOVE_ARRAY

Merge branch 'tg/split-index-fixes'

2018-02-13T21:39:13Z

The split-index mode had a few corner case bugs fixed. * tg/split-index-fixes: travis: run tests with GIT_TEST_SPLIT_INDEX split-index: don't write cache tree with null oid entries read-cache: fix reading the shared index for other repos

sha1_file: convert write_sha1_file to object_id

2018-01-30T18:42:36Z

Convert the definition and declaration of write_sha1_file to struct object_id and adjust usage of this function. This commit also converts static function write_sha1_file_prepare, as it is closely related. Rename these functions to write_object_file and write_object_file_prepare respectively. Replace sha1_to_hex, hashcpy and hashclr with their oid equivalents wherever possible. Signed-off-by: Patryk Obara Signed-off-by: Junio C Hamano

sha1_file: convert hash_sha1_file to object_id

2018-01-30T18:42:36Z

Convert the declaration and definition of hash_sha1_file to use struct object_id and adjust all function calls. Rename this function to hash_object_file. Signed-off-by: Patryk Obara Signed-off-by: Junio C Hamano

Use MOVE_ARRAY

2018-01-22T19:32:51Z

Use the helper macro MOVE_ARRAY to move arrays. This is shorter and safer, as it automatically infers the size of elements. Patch generated by Coccinelle and contrib/coccinelle/array.cocci in Travis CI's static analysis build job. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano