git, branch v2.25.0-rc1

Git 2.25-rc1

2020-01-02T20:38:30Z

Signed-off-by: Junio C Hamano

Merge branch 'js/use-test-tool-on-path'

2020-01-02T20:38:30Z

Test fix. * js/use-test-tool-on-path: t3008: find test-tool through path lookup

Merge branch 'js/mingw-reserved-filenames'

2020-01-02T20:38:30Z

Forbid pathnames that the platform's filesystem cannot represent on MinGW. * js/mingw-reserved-filenames: mingw: refuse paths containing reserved names mingw: short-circuit the conversion of `/dev/null` to UTF-16

Merge branch 'en/rebase-signoff-fix'

2020-01-02T20:38:30Z

"git rebase --signoff" stopped working when the command was written in C, which has been corrected. * en/rebase-signoff-fix: rebase: fix saving of --signoff state for am-based rebases

Merge branch 'em/freebsd-cirrus-ci'

2020-01-02T20:38:29Z

* em/freebsd-cirrus-ci: CI: add FreeBSD CI support via Cirrus-CI

Merge branch 'bk/p4-misc-usability'

2020-01-02T20:38:29Z

Miscellaneous small UX improvements on "git-p4". * bk/p4-misc-usability: git-p4: show detailed help when parsing options fail git-p4: yes/no prompts should sanitize user text

t3008: find test-tool through path lookup

2019-12-27T22:15:01Z

Do not use $GIT_BUILD_DIR without quotes; it may contain spaces and be split into fields. But it is not necessary to access test-tool with an absolute path in the first place as it can be found via path lookup. Remove the explicit path. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano

mailmap: mask accentless variant for Công Danh

2019-12-26T17:53:09Z

Signed-off-by: Junio C Hamano

Git 2.25-rc0

2019-12-25T19:22:02Z

Signed-off-by: Junio C Hamano

Merge branch 'en/fill-directory-fixes'

2019-12-25T19:22:02Z

Assorted fixes to the directory traversal API. * en/fill-directory-fixes: dir.c: use st_add3() for allocation size dir: consolidate similar code in treat_directory() dir: synchronize treat_leading_path() and read_directory_recursive() dir: fix checks on common prefix directory dir: break part of read_directory_recursive() out for reuse dir: exit before wildcard fall-through if there is no wildcard dir: remove stray quote character in comment Revert "dir.c: make 'git-status --ignored' work within leading directories" t3011: demonstrate directory traversal failures