Sync with maint

Junio C Hamano committed over 9 years ago

Merge branch 'ab/sha1dc-maint' into maint

Junio C Hamano committed over 9 years ago

sha1dc: update from upstream

Ævar Arnfjörð Bjarmason committed over 9 years ago

sha1dc: ignore indent-with-non-tab whitespace violations

Jeff King committed over 9 years ago

t5313: make extended-table test more deterministic

Jeff King committed over 9 years ago

t0012: test "-h" with builtins

Jeff King committed over 9 years ago

git: add hidden --list-builtins option

Jeff King committed over 9 years ago

version: convert to parse-options

Jeff King committed over 9 years ago

diff- and log- family: handle "git cmd -h" early

Junio C Hamano committed over 9 years ago

diff: rename diff_fill_sha1_info to diff_fill_oid_info

Brandon Williams committed over 9 years ago

diffcore-rename: use is_empty_blob_oid

Brandon Williams committed over 9 years ago

tree-diff: convert path_appendnew to object_id

Brandon Williams committed over 9 years ago

tree-diff: convert diff_tree_paths to struct object_id

Brandon Williams committed over 9 years ago

tree-diff: convert try_to_follow_renames to struct object_id

Brandon Williams committed over 9 years ago

builtin/diff-tree: cleanup references to sha1

Brandon Williams committed over 9 years ago

diff-tree: convert diff_tree_sha1 to struct object_id

Brandon Williams committed over 9 years ago

notes-merge: convert write_note_to_worktree to struct object_id

Brandon Williams committed over 9 years ago

notes-merge: convert verify_notes_filepair to struct object_id

Brandon Williams committed over 9 years ago

notes-merge: convert find_notes_merge_pair_ps to struct object_id

Brandon Williams committed over 9 years ago

notes-merge: convert merge_from_diffs to struct object_id

Brandon Williams committed over 9 years ago