What's cooking (2019/07 #07)
Junio C Hamano
parent
ed289a7a47
commit
d9e7ea7b52
|
|
@ -1,10 +1,10 @@
|
|||
To: git@vger.kernel.org
|
||||
Bcc: lwn@lwn.net
|
||||
Subject: What's cooking in git.git (Jul 2019, #06; Thu, 25)
|
||||
X-master-at: 3034dab9ed6b11970a53099a7b3ca981f1461365
|
||||
X-next-at: 0f2c4a37fdba75d06ae7254c4b30ed7739985214
|
||||
Subject: What's cooking in git.git (Jul 2019, #07; Mon, 29)
|
||||
X-master-at: 026dd738a6e5f1e42ef0f390feacb5ed6acc4ee8
|
||||
X-next-at: 4dedae46a21fbd9d3232915177485ac88f42884f
|
||||
|
||||
What's cooking in git.git (Jul 2019, #06; Thu, 25)
|
||||
What's cooking in git.git (Jul 2019, #07; Mon, 29)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with
|
||||
|
|
@ -12,9 +12,7 @@ Here are the topics that have been cooking. Commits prefixed with
|
|||
'+' are in 'next'. The ones marked with '.' do not appear in any of
|
||||
the integration branches, but I am still holding onto them.
|
||||
|
||||
The seventh batch is in; I've merged fix-up topics that has been in
|
||||
'master' for some time (i.e. up to the third batch of this cycle)
|
||||
down to 'maint'.
|
||||
The first preview for 2.23 has been tagged.
|
||||
|
||||
You can find the changes described here in the integration branches
|
||||
of the repositories listed at
|
||||
|
|
@ -24,181 +22,6 @@ of the repositories listed at
|
|||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* ab/test-env (2019-07-11) 9 commits
|
||||
(merged to 'next' on 2019-07-15 at 42e86beb20)
|
||||
+ env--helper: mark a file-local symbol as static
|
||||
(merged to 'next' on 2019-07-09 at 096658f382)
|
||||
+ tests: make GIT_TEST_FAIL_PREREQS a boolean
|
||||
+ tests: replace test_tristate with "git env--helper"
|
||||
+ tests README: re-flow a previously changed paragraph
|
||||
+ tests: make GIT_TEST_GETTEXT_POISON a boolean
|
||||
+ t6040 test: stop using global "script" variable
|
||||
+ config.c: refactor die_bad_number() to not call gettext() early
|
||||
+ env--helper: new undocumented builtin wrapping git_env_*()
|
||||
+ config tests: simplify include cycle test
|
||||
|
||||
Many GIT_TEST_* environment variables control various aspects of
|
||||
how our tests are run, but a few followed "non-empty is true, empty
|
||||
or unset is false" while others followed the usual "there are a few
|
||||
ways to spell true, like yes, on, etc., and also ways to spell
|
||||
false, like no, off, etc." convention.
|
||||
|
||||
|
||||
* ac/log-use-mailmap-by-default-transition (2019-07-15) 3 commits
|
||||
(merged to 'next' on 2019-07-19 at e5669de950)
|
||||
+ tests: defang pager tests by explicitly disabling the log.mailmap warning
|
||||
+ documentation: mention --no-use-mailmap and log.mailmap false setting
|
||||
+ log: add warning for unspecified log.mailmap setting
|
||||
|
||||
The "git log" command learns to issue a warning when log.mailmap
|
||||
configuration is not set and --[no-]mailmap option is not used, to
|
||||
prepare users for future versions of Git that uses the mailmap by
|
||||
default.
|
||||
|
||||
|
||||
* di/readme-markup-fix (2019-07-18) 1 commit
|
||||
(merged to 'next' on 2019-07-19 at 339470d824)
|
||||
+ README: fix rendering of text in angle brackets
|
||||
|
||||
Docfix.
|
||||
|
||||
|
||||
* es/local-atomic-push-failure-with-http (2019-07-16) 2 commits
|
||||
(merged to 'next' on 2019-07-19 at 8d5b776a96)
|
||||
+ transport-helper: avoid var decl in for () loop control
|
||||
(merged to 'next' on 2019-07-15 at 960e92d24f)
|
||||
+ transport-helper: enforce atomic in push_refs_with_push
|
||||
|
||||
"git push --atomic" that goes over the transport-helper (namely,
|
||||
the smart http transport) failed to prevent refs to be pushed when
|
||||
it can locally tell that one of the ref update will fail without
|
||||
having to consult the other end, which has been corrected.
|
||||
|
||||
|
||||
* jc/denoise-rm-to-resolve (2019-07-18) 1 commit
|
||||
(merged to 'next' on 2019-07-19 at 12f7e5d413)
|
||||
+ rm: resolving by removal is not a warning-worthy event
|
||||
|
||||
"git rm" to resolve a conflicted path leaked an internal message
|
||||
"needs merge" before actually removing the path, which was
|
||||
confusing. This has been corrected.
|
||||
|
||||
|
||||
* jc/post-c89-rules-doc (2019-07-18) 1 commit
|
||||
(merged to 'next' on 2019-07-19 at 8acd58e189)
|
||||
+ CodingGuidelines: spell out post-C89 rules
|
||||
|
||||
We have been trying out a few language features outside c89; the
|
||||
coding guidelines document did not talk about them and instead had
|
||||
a blanket ban against them.
|
||||
|
||||
|
||||
* jk/test-commit-bulk (2019-07-23) 6 commits
|
||||
(merged to 'next' on 2019-07-23 at edc849c7dd)
|
||||
+ t6200: use test_commit_bulk
|
||||
+ t5703: use test_commit_bulk
|
||||
+ t5702: use test_commit_bulk
|
||||
+ t3311: use test_commit_bulk
|
||||
+ t5310: increase the number of bitmapped commits
|
||||
+ test-lib: introduce test_commit_bulk
|
||||
|
||||
A test helper has been introduced to optimize preparation of test
|
||||
repositories with many simple commits, and a handful of test
|
||||
scripts have been updated to use it.
|
||||
|
||||
|
||||
* js/clean-report-too-long-a-path (2019-07-19) 1 commit
|
||||
(merged to 'next' on 2019-07-19 at b7da0a821c)
|
||||
+ clean: show an error message when the path is too long
|
||||
|
||||
"git clean" silently skipped a path when it cannot lstat() it; now
|
||||
it gives a warning.
|
||||
|
||||
|
||||
* js/mingw-spawn-with-spaces-in-path (2019-07-16) 1 commit
|
||||
(merged to 'next' on 2019-07-19 at 33dd6d0401)
|
||||
+ mingw: support spawning programs containing spaces in their names
|
||||
|
||||
Window 7 update ;-)
|
||||
|
||||
|
||||
* js/unmap-before-ext-diff (2019-07-11) 1 commit
|
||||
(merged to 'next' on 2019-07-15 at 7aa292c66c)
|
||||
+ diff: munmap() file contents before running external diff
|
||||
|
||||
Windows update.
|
||||
|
||||
|
||||
* mt/dir-iterator-updates (2019-07-11) 10 commits
|
||||
(merged to 'next' on 2019-07-19 at 2ebb586ce6)
|
||||
+ clone: replace strcmp by fspathcmp
|
||||
+ clone: use dir-iterator to avoid explicit dir traversal
|
||||
+ clone: extract function from copy_or_link_directory
|
||||
+ clone: copy hidden paths at local clone
|
||||
+ dir-iterator: add flags parameter to dir_iterator_begin
|
||||
+ dir-iterator: refactor state machine model
|
||||
+ dir-iterator: use warning_errno when possible
|
||||
+ dir-iterator: add tests for dir-iterator API
|
||||
+ clone: better handle symlinked files at .git/objects/
|
||||
+ clone: test for our behavior on odd objects/* content
|
||||
|
||||
Adjust the dir-iterator API and apply it to the local clone
|
||||
optimization codepath.
|
||||
|
||||
|
||||
* rm/gpg-program-doc-fix (2019-07-12) 1 commit
|
||||
(merged to 'next' on 2019-07-15 at ef358ec2e9)
|
||||
+ gpg(docs): use correct --verify syntax
|
||||
|
||||
Docfix.
|
||||
|
||||
|
||||
* sr/gpg-interface-stop-at-the-end (2019-07-16) 1 commit
|
||||
(merged to 'next' on 2019-07-19 at 5d38aa1236)
|
||||
+ gpg-interface: do not scan past the end of buffer
|
||||
|
||||
A codepath that reads from GPG for signed object verification read
|
||||
past the end of allocated buffer, which has been fixed.
|
||||
|
||||
|
||||
* tg/range-diff-output-update (2019-07-11) 14 commits
|
||||
(merged to 'next' on 2019-07-15 at b847d206ed)
|
||||
+ range-diff: add headers to the outer hunk header
|
||||
+ range-diff: add filename to inner diff
|
||||
+ range-diff: add section header instead of diff header
|
||||
+ range-diff: suppress line count in outer diff
|
||||
+ range-diff: don't remove funcname from inner diff
|
||||
+ range-diff: split lines manually
|
||||
+ range-diff: fix function parameter indentation
|
||||
+ apply: make parse_git_diff_header public
|
||||
+ apply: only pass required data to gitdiff_* functions
|
||||
+ apply: only pass required data to find_name_*
|
||||
+ apply: only pass required data to check_header_line
|
||||
+ apply: only pass required data to git_header_name
|
||||
+ apply: only pass required data to skip_tree_prefix
|
||||
+ apply: replace marc.info link with public-inbox
|
||||
|
||||
"git range-diff" output has been tweaked for easier identification
|
||||
of which part of what file the patch shown is about.
|
||||
|
||||
|
||||
* tg/stash-keep-index-with-removed-paths (2019-07-16) 1 commit
|
||||
(merged to 'next' on 2019-07-19 at d4ae24a939)
|
||||
+ stash: fix handling removed files with --keep-index
|
||||
|
||||
"git stash --keep-index" did not work correctly on paths that have
|
||||
been removed, which has been fixed.
|
||||
|
||||
|
||||
* vn/xmmap-gently (2019-07-14) 1 commit
|
||||
(merged to 'next' on 2019-07-19 at d95c1d2be3)
|
||||
+ read-cache.c: do not die if mmap fails
|
||||
|
||||
Clean-up an error codepath.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* bb/grep-pcre2-bug-message-fix (2019-07-23) 1 commit
|
||||
(merged to 'next' on 2019-07-23 at 8bd5a68618)
|
||||
+ grep: print the pcre2_jit_on value
|
||||
|
|
@ -208,38 +31,6 @@ of the repositories listed at
|
|||
The codepath may want to just simply be removed, though.
|
||||
|
||||
|
||||
* ra/rebase-i-more-options (2019-07-23) 4 commits
|
||||
- SQUASH???
|
||||
- rebase -i: support --committer-date-is-author-date
|
||||
- sequencer: add NULL checks under read_author_script
|
||||
- rebase -i: add --ignore-whitespace flag
|
||||
|
||||
"git rebase -i" learned a few options that are known by "git
|
||||
rebase" proper.
|
||||
|
||||
Needs a bit of fixups, at least.
|
||||
|
||||
|
||||
* sg/travis-gcc-4.8 (2019-07-19) 1 commit
|
||||
(merged to 'next' on 2019-07-25 at e3d546eb15)
|
||||
+ travis-ci: build with GCC 4.8 as well
|
||||
|
||||
Add a job to build with a tad older GCC to make sure we are still
|
||||
buildable.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ab/pcre-jit-fixes (2019-07-24) 3 commits
|
||||
- grep: stop using a custom JIT stack with PCRE v1
|
||||
- grep: stop "using" a custom JIT stack with PCRE v2
|
||||
- grep: remove overly paranoid BUG(...) code
|
||||
|
||||
A few simplification and bugfixes to PCRE interface.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* jk/xdiff-clamp-funcname-context-index (2019-07-23) 1 commit
|
||||
(merged to 'next' on 2019-07-25 at b2944a0ba6)
|
||||
+ xdiff: clamp function context indices in post-image
|
||||
|
|
@ -248,8 +39,6 @@ of the repositories listed at
|
|||
looking for --funcion-context line in a corner case, which has been
|
||||
corrected.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* js/rebase-cleanup (2019-07-25) 2 commits
|
||||
(merged to 'next' on 2019-07-25 at 3d9cedf470)
|
||||
|
|
@ -258,58 +47,17 @@ of the repositories listed at
|
|||
|
||||
A few leftover cleanup to "git rebase" in C.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
* sg/travis-gcc-4.8 (2019-07-19) 1 commit
|
||||
(merged to 'next' on 2019-07-25 at e3d546eb15)
|
||||
+ travis-ci: build with GCC 4.8 as well
|
||||
|
||||
* js/rebase-r-strategy (2019-07-25) 12 commits
|
||||
- rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
|
||||
- t3418: test `rebase -r` with merge strategies
|
||||
- t/lib-rebase: prepare for testing `git rebase --rebase-merges`
|
||||
- rebase -r: support merge strategies other than `recursive`
|
||||
- t3427: mark two test cases as requiring support for `git rebase -p`
|
||||
- t3427: fix another incorrect assumption
|
||||
- t3427: accommodate for the `rebase --merge` backend having been replaced
|
||||
- t3427: fix erroneous assumption
|
||||
- t3427: condense the unnecessarily repetitive test cases into three
|
||||
- t3427: move the `filter-branch` invocation into the `setup` case
|
||||
- t3427: simplify the `setup` test case significantly
|
||||
- t3427: add a clarifying comment
|
||||
|
||||
"git rebase --rebase-merges" learned to drive different merge
|
||||
strategies and pass strategy specific options to them.
|
||||
|
||||
|
||||
* js/trace2-json-schema (2019-07-25) 3 commits
|
||||
- ci: run trace2 schema validation in the CI suite
|
||||
- trace2: add a schema validator for trace2 events
|
||||
- trace2: add a JSON schema for trace2 events
|
||||
|
||||
The JSON output produced by "trace2" subsystem now has JSON schema
|
||||
defined on it, to allow us validate the output and catch deviation.
|
||||
|
||||
The CI integration may be a bit too heavy-handed.
|
||||
Add a job to build with a tad older GCC to make sure we are still
|
||||
buildable.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* cb/xdiff-no-system-includes-in-dot-c (2019-06-19) 1 commit
|
||||
- xdiff: avoid accidental redefinition of LFS feature in OpenIndiana
|
||||
|
||||
Compilation fix.
|
||||
|
||||
Will be rerolled together with patches from the
|
||||
jk/no-system-includes-in-dot-c topic.
|
||||
|
||||
|
||||
* jk/no-system-includes-in-dot-c (2019-06-19) 2 commits
|
||||
- wt-status.h: drop stdio.h include
|
||||
- verify-tag: drop signal.h include
|
||||
|
||||
Compilation fix.
|
||||
|
||||
Will be rerolled with the above.
|
||||
|
||||
|
||||
* nd/index-dump-in-json (2019-06-26) 11 commits
|
||||
- SQUASH???
|
||||
- t3008: use the new SINGLE_CPU prereq
|
||||
|
|
@ -400,6 +148,78 @@ of the repositories listed at
|
|||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* vn/reset-deleted-ita (2019-07-26) 1 commit
|
||||
- reset: unstage empty deleted ita files
|
||||
|
||||
"git reset HEAD [<pathspec>]" did not reset an empty file that was
|
||||
added with the intent-to-add bit.
|
||||
|
||||
Expecting a reroll.
|
||||
|
||||
|
||||
* cb/xdiff-no-system-includes-in-dot-c (2019-07-28) 3 commits
|
||||
(merged to 'next' on 2019-07-29 at 35ea0d8cba)
|
||||
+ xdiff: remove duplicate headers from xpatience.c
|
||||
+ xdiff: remove duplicate headers from xhistogram.c
|
||||
+ xdiff: drop system includes in xutils.c
|
||||
(this branch uses jk/no-system-includes-in-dot-c.)
|
||||
|
||||
Compilation fix.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jk/no-system-includes-in-dot-c (2019-06-19) 2 commits
|
||||
(merged to 'next' on 2019-07-29 at 8081b8c13d)
|
||||
+ wt-status.h: drop stdio.h include
|
||||
+ verify-tag: drop signal.h include
|
||||
(this branch is used by cb/xdiff-no-system-includes-in-dot-c.)
|
||||
|
||||
Compilation fix.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
* ra/rebase-i-more-options (2019-07-23) 4 commits
|
||||
- SQUASH???
|
||||
- rebase -i: support --committer-date-is-author-date
|
||||
- sequencer: add NULL checks under read_author_script
|
||||
- rebase -i: add --ignore-whitespace flag
|
||||
|
||||
"git rebase -i" learned a few options that are known by "git
|
||||
rebase" proper.
|
||||
|
||||
Needs a bit of fixups, at least.
|
||||
|
||||
|
||||
* js/rebase-r-strategy (2019-07-25) 12 commits
|
||||
- rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
|
||||
- t3418: test `rebase -r` with merge strategies
|
||||
- t/lib-rebase: prepare for testing `git rebase --rebase-merges`
|
||||
- rebase -r: support merge strategies other than `recursive`
|
||||
- t3427: mark two test cases as requiring support for `git rebase -p`
|
||||
- t3427: fix another incorrect assumption
|
||||
- t3427: accommodate for the `rebase --merge` backend having been replaced
|
||||
- t3427: fix erroneous assumption
|
||||
- t3427: condense the unnecessarily repetitive test cases into three
|
||||
- t3427: move the `filter-branch` invocation into the `setup` case
|
||||
- t3427: simplify the `setup` test case significantly
|
||||
- t3427: add a clarifying comment
|
||||
|
||||
"git rebase --rebase-merges" learned to drive different merge
|
||||
strategies and pass strategy specific options to them.
|
||||
|
||||
|
||||
* js/trace2-json-schema (2019-07-25) 3 commits
|
||||
. ci: run trace2 schema validation in the CI suite
|
||||
. trace2: add a schema validator for trace2 events
|
||||
. trace2: add a JSON schema for trace2 events
|
||||
|
||||
The JSON output produced by "trace2" subsystem now has JSON schema
|
||||
defined on it, to allow us validate the output and catch deviation.
|
||||
|
||||
The CI integration may be a bit too heavy-handed.
|
||||
|
||||
|
||||
* js/builtin-add-i (2019-07-18) 11 commits
|
||||
- built-in add -i: implement the `help` command
|
||||
- built-in add -i: use color in the main loop
|
||||
|
|
@ -416,9 +236,8 @@ of the repositories listed at
|
|||
The beginning of rewriting "git add -i" in C.
|
||||
|
||||
|
||||
* js/visual-studio (2019-07-18) 24 commits
|
||||
* js/visual-studio (2019-07-29) 23 commits
|
||||
- git: avoid calling aliased builtins via their dashed form
|
||||
- t5505,t5516: create .git/branches/ when needed
|
||||
- bin-wrappers: append `.exe` to target paths if necessary
|
||||
- .gitignore: ignore Visual Studio's temporary/generated files
|
||||
- .gitignore: touch up the entries regarding Visual Studio
|
||||
|
|
@ -444,25 +263,27 @@ of the repositories listed at
|
|||
|
||||
Support building Git with Visual Studio
|
||||
|
||||
The ".git/branches" bit needs to be ejected and treated separately,
|
||||
but other than that, the topic looked reasonable.
|
||||
The bits about .git/branches/* have been dropped from the series.
|
||||
We may want to drop the support for it, but until that happens, the
|
||||
tests should rely on the existence of the support to pass.
|
||||
|
||||
|
||||
* bc/hash-independent-tests-part-4 (2019-07-01) 10 commits
|
||||
- t2203: avoid hard-coded object ID values
|
||||
- t1710: make hash independent
|
||||
- t1007: remove SHA1 prerequisites
|
||||
- t0090: make test pass with SHA-256
|
||||
- t0027: make hash size independent
|
||||
- t6030: make test work with SHA-256
|
||||
- t5000: make hash independent
|
||||
- t1450: make hash size independent
|
||||
- t1410: make hash size independent
|
||||
- t: add helper to convert object IDs to paths
|
||||
(merged to 'next' on 2019-07-29 at d1efaea0ec)
|
||||
+ t2203: avoid hard-coded object ID values
|
||||
+ t1710: make hash independent
|
||||
+ t1007: remove SHA1 prerequisites
|
||||
+ t0090: make test pass with SHA-256
|
||||
+ t0027: make hash size independent
|
||||
+ t6030: make test work with SHA-256
|
||||
+ t5000: make hash independent
|
||||
+ t1450: make hash size independent
|
||||
+ t1410: make hash size independent
|
||||
+ t: add helper to convert object IDs to paths
|
||||
|
||||
Update to the tests to help SHA-256 transition continues.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* es/walken-tutorial (2019-07-02) 1 commit
|
||||
|
|
@ -496,12 +317,25 @@ of the repositories listed at
|
|||
+ t4210: skip more command-line encoding tests on MinGW
|
||||
+ grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
|
||||
+ log tests: test regex backends in "--encode=<enc>" tests
|
||||
(this branch is used by ab/pcre-jit-fixes.)
|
||||
|
||||
Retire use of kwset library, which is an optimization for looking
|
||||
for fixed strings, with use of pcre2 JIT.
|
||||
|
||||
Needs to wait for a few pcre JIT related fixups, including the
|
||||
handling of non-UTF8 haystack.
|
||||
Kicked out of 'next' to give the topic a chance to get rebooted.
|
||||
|
||||
|
||||
* ab/pcre-jit-fixes (2019-07-26) 7 commits
|
||||
- grep: do not enter PCRE2_UTF mode on fixed matching
|
||||
- grep: stess test PCRE v2 on invalid UTF-8 data
|
||||
- grep: create a "is_fixed" member in "grep_pat"
|
||||
- grep: consistently use "p->fixed" in compile_regexp()
|
||||
- grep: stop using a custom JIT stack with PCRE v1
|
||||
- grep: stop "using" a custom JIT stack with PCRE v2
|
||||
- grep: remove overly paranoid BUG(...) code
|
||||
(this branch uses ab/no-kwset.)
|
||||
|
||||
A few simplification and bugfixes to PCRE interface.
|
||||
|
||||
|
||||
* md/list-objects-filter-combo (2019-06-28) 10 commits
|
||||
|
|
|
|||
Loading…
Reference in New Issue