Sync with v2.16.1

Junio C Hamano committed over 8 years ago

Git 2.16.1

Junio C Hamano committed over 8 years ago

Start 2.17 cycle

Junio C Hamano committed over 8 years ago

Merge branch 'bc/hash-algo' into maint

Junio C Hamano committed over 8 years ago

t5601-clone: test case-conflicting files on case-insensitive filesystem

Eric Sunshine committed over 8 years ago

merge-recursive: add explanation for src_entry and dst_entry

Elijah Newren committed over 8 years ago

merge-recursive: fix logic ordering issue

Elijah Newren committed over 8 years ago

Tighten and correct a few testcases for merging and cherry-picking

Elijah Newren committed over 8 years ago

repository: pre-initialize hash algo pointer

brian m. carlson committed over 8 years ago

files_initial_transaction_commit(): only unlock if locked

Mathias Rav committed over 8 years ago

sha1_file: improve sha1_file_name() perfs

Christian Couder committed over 8 years ago

http: support omitting data from traces

Jonathan Tan committed over 8 years ago

http: support cookie redaction when tracing

Jonathan Tan committed over 8 years ago

cocci: use format keyword instead of a literal string

René Scharfe committed over 8 years ago

packfile: use get_be64() for large offsets

Derrick Stolee committed over 8 years ago

run-command.c: print new cwd in trace_run_command()

Nguyễn Thái Ngọc Duy committed over 8 years ago

run-command.c: print env vars in trace_run_command()

Nguyễn Thái Ngọc Duy committed over 8 years ago

run-command.c: print program 'git' when tracing git_cmd mode

Nguyễn Thái Ngọc Duy committed over 8 years ago

run-command.c: introduce trace_run_command()

Nguyễn Thái Ngọc Duy committed over 8 years ago

travis: run tests with GIT_TEST_SPLIT_INDEX

Thomas Gummerer committed over 8 years ago