Merge branch 'da/difftool-dir-diff-symlink-fix'

Junio C Hamano committed almost 5 years ago

Merge branch 'hn/refs-errno-cleanup'

Junio C Hamano committed almost 5 years ago

Merge branch 'ab/refs-files-cleanup'

Junio C Hamano committed almost 5 years ago

Merge branch 'cb/cvsserver'

Junio C Hamano committed almost 5 years ago

Merge branch 'jx/ci-l10n'

Junio C Hamano committed almost 5 years ago

Merge branch 'jk/clone-unborn-head-in-bare'

Junio C Hamano committed almost 5 years ago

Merge branch 'en/stash-df-fix'

Junio C Hamano committed almost 5 years ago

builtin/repack.c: pass `--refs-snapshot` when writing bitmaps

Taylor Blau committed almost 5 years ago

bisect--helper: add space between colon and following sentence

Bagas Sanjaya committed almost 5 years ago

blame: describe default output format

Bagas Sanjaya committed almost 5 years ago

fsck: report invalid object type-path combinations

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

fsck: don't hard die on invalid object types

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

object-file.c: stop dying in parse_loose_header()

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

object-file.c: return ULHR_TOO_LONG on "header too long"

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

object-file.c: use "enum" return type for unpack_loose_header()

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

object-file.c: simplify unpack_loose_short_header()

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

object-file.c: make parse_loose_header_extended() public

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

object-file.c: return -1, not "status" from unpack_loose_header()

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

object-file.c: don't set "typep" when returning non-zero

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

cat-file tests: test for current --allow-unknown-type behavior

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