summaryrefslogtreecommitdiff
path: root/t/t4013/diff.log_-SF_master
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-06-19 12:38:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-19 12:38:44 -0700
commita6f38c109b6e70a1c788581194fc9b8669eea231 (patch)
treeb99d5c9b930d4c386789a5083fa2da804075d51c /t/t4013/diff.log_-SF_master
parentMerge branch 'sb/submodule-rm-absorb' (diff)
parentdiff: rename diff_fill_sha1_info to diff_fill_oid_info (diff)
downloadtgif-a6f38c109b6e70a1c788581194fc9b8669eea231.tar.xz
Merge branch 'bw/object-id'
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 ...
Diffstat (limited to 't/t4013/diff.log_-SF_master')
0 files changed, 0 insertions, 0 deletions