Merge branch 'mt/cleanly-die-upon-missing-required-filter'

Junio C Hamano committed over 5 years ago

Merge branch 'jk/open-dotgitx-with-nofollow'

Junio C Hamano committed over 5 years ago

diff --no-index tests: test mode normalization

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

pack-bitmap: avoid traversal of objects referenced by uninteresting tag

Patrick Steinhardt committed over 5 years ago

remote-curl: fall back to basic auth if Negotiate fails

Christopher Schenk committed over 5 years ago

t0052: add simple-ipc tests and t/helper/test-simple-ipc tool

Jeff Hostetler committed over 5 years ago

simple-ipc: add Unix domain socket implementation

Jeff Hostetler committed over 5 years ago

diff --no-index tests: add test for --exit-code

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

transport: also free remote_refs in transport_disconnect()

Andrzej Hunt committed over 5 years ago

parse-options: don't leak alias help messages

Andrzej Hunt committed over 5 years ago

parse-options: convert bitfield values to use binary shift

Andrzej Hunt committed over 5 years ago

tree.h API: simplify read_tree_recursive() signature

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

tree.h API: expose read_tree_1() as read_tree_at()

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

archive: stop passing "stage" through read_tree_recursive()

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

ls-files: refactor away read_tree()

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

ls-files: don't needlessly pass around stage variable

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

tree.c API: move read_tree() into builtin/ls-files.c

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

ls-files tests: add meaningful --with-tree tests

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

show tests: add test for "git show <tree>"

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

Add testing with merge-ort merge strategy

Elijah Newren committed over 5 years ago