git/combine-diff.c, branch v2.14.0Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://www.git.shady.money/git/atom?h=v2.14.02017-06-24T21:28:40ZMerge branch 'bw/ls-files-sans-the-index'2017-06-24T21:28:40ZJunio C Hamanogitster@pobox.com2017-06-24T21:28:40Zurn:sha1:5812b3f73b0d319650032833840278fd556fecf3
Code clean-up.
* bw/ls-files-sans-the-index:
ls-files: factor out tag calculation
ls-files: factor out debug info into a function
ls-files: convert show_files to take an index
ls-files: convert show_ce_entry to take an index
ls-files: convert prune_cache to take an index
ls-files: convert ce_excluded to take an index
ls-files: convert show_ru_info to take an index
ls-files: convert show_other_files to take an index
ls-files: convert show_killed_files to take an index
ls-files: convert write_eolinfo to take an index
ls-files: convert overlay_tree_on_cache to take an index
tree: convert read_tree to take an index parameter
convert: convert renormalize_buffer to take an index
convert: convert convert_to_git to take an index
convert: convert convert_to_git_filter_fd to take an index
convert: convert crlf_to_git to take an index
convert: convert get_cached_convert_stats_ascii to take an index
convert: convert convert_to_git to take an index2017-06-13T18:40:51ZBrandon Williamsbmwill@google.com2017-06-12T22:13:55Zurn:sha1:82b474e025e89cfa294e81611c81355a73dc23a2
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
tree-diff: convert diff_tree_paths to struct object_id2017-06-05T02:23:58ZBrandon Williamsbmwill@google.com2017-05-30T17:31:06Zurn:sha1:fda94b416ed07988e645cec22bf61742d4dd5c95
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff-tree: convert diff_tree_sha1 to struct object_id2017-06-05T02:23:58ZBrandon Williamsbmwill@google.com2017-05-30T17:31:03Zurn:sha1:66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
combine-diff: convert find_paths_* to struct object_id2017-06-02T00:36:07ZBrandon Williamsbmwill@google.com2017-05-30T17:30:56Zurn:sha1:09fae19aa8db639d2384a98f8ebd2f9ec66f6e28
Convert find_paths_generic and find_paths_multitree to use struct
object_id.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
combine-diff: convert diff_tree_combined to struct object_id2017-06-02T00:36:07ZBrandon Williamsbmwill@google.com2017-05-30T17:30:55Zurn:sha1:b9acf54dbd2906249abb2a406d466b47da44678e
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff: convert fill_filespec to struct object_id2017-06-02T00:36:07ZBrandon Williamsbmwill@google.com2017-05-30T17:30:50Zurn:sha1:f9704c2d823f437aeed50e591415f24aebdda71d
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'bc/object-id'2017-04-20T04:37:13ZJunio C Hamanogitster@pobox.com2017-04-20T04:37:13Zurn:sha1:b1081e4004091947b6c6a806625addd1cbba61b7
Conversion from unsigned char [40] to struct object_id continues.
* bc/object-id:
Documentation: update and rename api-sha1-array.txt
Rename sha1_array to oid_array
Convert sha1_array_for_each_unique and for_each_abbrev to object_id
Convert sha1_array_lookup to take struct object_id
Convert remaining callers of sha1_array_lookup to object_id
Make sha1_array_append take a struct object_id *
sha1-array: convert internal storage for struct sha1_array to object_id
builtin/pull: convert to struct object_id
submodule: convert check_for_new_submodule_commits to object_id
sha1_name: convert disambiguate_hint_fn to take object_id
sha1_name: convert struct disambiguate_state to object_id
test-sha1-array: convert most code to struct object_id
parse-options-cb: convert sha1_array_append caller to struct object_id
fsck: convert init_skiplist to struct object_id
builtin/receive-pack: convert portions to struct object_id
builtin/pull: convert portions to struct object_id
builtin/diff: convert to struct object_id
Convert GIT_SHA1_RAWSZ used for allocation to GIT_MAX_RAWSZ
Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ
Define new hash-size constants for allocating memory
Rename sha1_array to oid_array2017-03-31T15:33:56Zbrian m. carlsonsandals@crustytoothpaste.net2017-03-31T01:40:00Zurn:sha1:910650d2f8755359ab7b1f0e2a2d576c06a68091
Since this structure handles an array of object IDs, rename it to struct
oid_array. Also rename the accessor functions and the initialization
constant.
This commit was produced mechanically by providing non-Documentation
files to the following Perl one-liners:
perl -pi -E 's/struct sha1_array/struct oid_array/g'
perl -pi -E 's/\bsha1_array_/oid_array_/g'
perl -pi -E 's/SHA1_ARRAY_INIT/OID_ARRAY_INIT/g'
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Make sha1_array_append take a struct object_id *2017-03-31T15:33:55Zbrian m. carlsonsandals@crustytoothpaste.net2017-03-31T01:39:56Zurn:sha1:98a72ddc12e13231537150607f4a6a8ff8b43854
Convert the callers to pass struct object_id by changing the function
declaration and definition and applying the following semantic patch:
@@
expression E1, E2;
@@
- sha1_array_append(E1, E2.hash)
+ sha1_array_append(E1, &E2)
@@
expression E1, E2;
@@
- sha1_array_append(E1, E2->hash)
+ sha1_array_append(E1, E2)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>