git/diff.h, 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-19T19:38:44ZMerge branch 'bw/object-id'2017-06-19T19:38:44ZJunio C Hamanogitster@pobox.com2017-06-19T19:38:44Zurn:sha1:a6f38c109b6e70a1c788581194fc9b8669eea231
Conversion from uchar[20] to struct object_id continues.
* bw/object-id: (33 commits)
diff: rename diff_fill_sha1_info to diff_fill_oid_info
diffcore-rename: use is_empty_blob_oid
tree-diff: convert path_appendnew to object_id
tree-diff: convert diff_tree_paths to struct object_id
tree-diff: convert try_to_follow_renames to struct object_id
builtin/diff-tree: cleanup references to sha1
diff-tree: convert diff_tree_sha1 to struct object_id
notes-merge: convert write_note_to_worktree to struct object_id
notes-merge: convert verify_notes_filepair to struct object_id
notes-merge: convert find_notes_merge_pair_ps to struct object_id
notes-merge: convert merge_from_diffs to struct object_id
notes-merge: convert notes_merge* to struct object_id
tree-diff: convert diff_root_tree_sha1 to struct object_id
combine-diff: convert find_paths_* to struct object_id
combine-diff: convert diff_tree_combined to struct object_id
diff: convert diff_flush_patch_id to struct object_id
patch-ids: convert to struct object_id
diff: finish conversion for prepare_temp_file to struct object_id
diff: convert reuse_worktree_file to struct object_id
diff: convert fill_filespec to struct object_id
...
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>
Merge branch 'js/blame-lib'2017-06-05T00:18:12ZJunio C Hamanogitster@pobox.com2017-06-05T00:18:11Zurn:sha1:583c6a229571e1aa3bfb773427c67807ec1b8c21
The internal logic used in "git blame" has been libified to make it
easier to use by cgit.
* js/blame-lib: (29 commits)
blame: move entry prepend to libgit
blame: move scoreboard setup to libgit
blame: move scoreboard-related methods to libgit
blame: move fake-commit-related methods to libgit
blame: move origin-related methods to libgit
blame: move core structures to header
blame: create entry prepend function
blame: create scoreboard setup function
blame: create scoreboard init function
blame: rework methods that determine 'final' commit
blame: wrap blame_sort and compare_blame_final
blame: move progress updates to a scoreboard callback
blame: make sanity_check use a callback in scoreboard
blame: move no_whole_file_rename flag to scoreboard
blame: move xdl_opts flags to scoreboard
blame: move show_root flag to scoreboard
blame: move reverse flag to scoreboard
blame: move contents_from to scoreboard
blame: move copy/move thresholds to scoreboard
blame: move stat counters to scoreboard
...
tree-diff: convert diff_root_tree_sha1 to struct object_id2017-06-02T00:36:30ZBrandon Williamsbmwill@google.com2017-05-30T17:30:57Zurn:sha1:7b8dea0c7570a2028f204498c82c8ca7ec6950e3
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 diff_flush_patch_id to struct object_id2017-06-02T00:36:07ZBrandon Williamsbmwill@google.com2017-05-30T17:30:54Zurn:sha1:bd25f288767aa26f42ac02d2d36695c8df9134dd
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff: convert diff_change to struct object_id2017-06-02T00:36:07ZBrandon Williamsbmwill@google.com2017-05-30T17:30:49Zurn:sha1:94a0097a41f09e00322add6d1cf62b3610b6a85c
Convert diff_change to take a struct object_id. In addition convert the
function pointer type 'change_fn_t' to also take a struct object_id.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff: convert diff_addremove to struct object_id2017-06-02T00:36:07ZBrandon Williamsbmwill@google.com2017-05-30T17:30:47Zurn:sha1:c26022ea8f54649ed6b3b545dd3158907abe5d2c
Convert diff_addremove to take a struct object_id. In addtion convert
the function pointer type 'add_remove_fn_t' to also take a struct
object_id.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
blame: move textconv_object with related functions2017-05-24T06:41:50ZJeff Smithwhydoubt@gmail.com2017-05-24T05:15:10Zurn:sha1:3a35cb2ea8ab5d44d6ea6290b7af8a7c8623e4c2
textconv_object is used in places other than blame.c and should be moved
to a more appropriate location. Other textconv related functions are
located in diff.c so that seems as good a place as any.
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>