delta/git.git/diff.h, branch ks/prepare-commit-msg-sample-fix

Merge branch 'bw/object-id'

2017-06-19T19:38:44+00:00

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_id

2017-06-05T02:23:58+00:00

Signed-off-by: Brandon Williams 
Signed-off-by: Junio C Hamano

diff-tree: convert diff_tree_sha1 to struct object_id

2017-06-05T02:23:58+00:00

Signed-off-by: Brandon Williams 
Signed-off-by: Junio C Hamano

Merge branch 'js/blame-lib'

2017-06-05T00:18:12+00:00

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_id

2017-06-02T00:36:30+00:00

Signed-off-by: Brandon Williams 
Signed-off-by: Junio C Hamano

combine-diff: convert diff_tree_combined to struct object_id

2017-06-02T00:36:07+00:00

Signed-off-by: Brandon Williams 
Signed-off-by: Junio C Hamano

diff: convert diff_flush_patch_id to struct object_id

2017-06-02T00:36:07+00:00

Signed-off-by: Brandon Williams 
Signed-off-by: Junio C Hamano

diff: convert diff_change to struct object_id

2017-06-02T00:36:07+00:00

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 
Signed-off-by: Junio C Hamano

diff: convert diff_addremove to struct object_id

2017-06-02T00:36:07+00:00

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 
Signed-off-by: Junio C Hamano

blame: move textconv_object with related functions

2017-05-24T06:41:50+00:00

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 
Signed-off-by: Junio C Hamano