git, branch v2.25.0-rc0

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

Merge branch 'rs/test-cleanup'

2019-12-25T19:22:01Z

Test cleanup. * rs/test-cleanup: t6030: don't create unused file t5580: don't create unused file t3501: don't create unused file t7004: don't create unused file t4256: don't create unused file

Merge branch 'mr/bisect-save-pointer-to-const-string'

2019-12-25T19:22:01Z

Code cleanup. * mr/bisect-save-pointer-to-const-string: bisect--helper: convert `*_warning` char pointers to char arrays.

Merge branch 'rs/xdiff-ignore-ws-w-func-context'

2019-12-25T19:22:01Z

Extend test coverage for a recent fix. * rs/xdiff-ignore-ws-w-func-context: t4015: improve coverage of function context test

Merge branch 'js/add-p-in-c'

2019-12-25T19:22:01Z

The effort to move "git-add--interactive" to C continues. * js/add-p-in-c: built-in add -p: show helpful hint when nothing can be staged built-in add -p: only show the applicable parts of the help text built-in add -p: implement the 'q' ("quit") command built-in add -p: implement the '/' ("search regex") command built-in add -p: implement the 'g' ("goto") command built-in add -p: implement hunk editing strbuf: add a helper function to call the editor "on an strbuf" built-in add -p: coalesce hunks after splitting them built-in add -p: implement the hunk splitting feature built-in add -p: show different prompts for mode changes and deletions built-in app -p: allow selecting a mode change as a "hunk" built-in add -p: handle deleted empty files built-in add -p: support multi-file diffs built-in add -p: offer a helpful error message when hunk navigation failed built-in add -p: color the prompt and the help text built-in add -p: adjust hunk headers as needed built-in add -p: show colored hunks by default built-in add -i: wire up the new C code for the `patch` command built-in add -i: start implementing the `patch` functionality in C

Merge branch 'jc/drop-gen-hdrs'

2019-12-25T19:22:00Z

Code cleanup. * jc/drop-gen-hdrs: Makefile: drop GEN_HDRS

Merge branch 'ja/doc-markup-cleanup'

2019-12-25T19:22:00Z

Doc cleanup. * ja/doc-markup-cleanup: doc: indent multi-line items in list doc: remove non pure ASCII characters

Merge branch 'rs/ref-read-cleanup'

2019-12-25T19:22:00Z

Code cleanup. * rs/ref-read-cleanup: remote: pass NULL to read_ref_full() because object ID is not needed refs: pass NULL to refs_read_ref_full() because object ID is not needed

Merge branch 'rb/p4-lfs'

2019-12-25T19:22:00Z

"git p4" used to ignore lfs.storage configuration variable, which has been corrected. * rb/p4-lfs: git-p4: honor lfs.storage configuration variable