summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-06-03 19:50:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-06-03 19:50:20 (GMT)
commit5ceaf660a03faf2601f5f5fdaf92e36e10f968e7 (patch)
treeb205368a50b14fb778e58c76749b1fd0eb1cd3b0
parent09e9214d42b5b0a084d1b78f59cd605d0d0ed5b4 (diff)
downloadgit-5ceaf660a03faf2601f5f5fdaf92e36e10f968e7.zip
git-5ceaf660a03faf2601f5f5fdaf92e36e10f968e7.tar.gz
git-5ceaf660a03faf2601f5f5fdaf92e36e10f968e7.tar.bz2
What's cooking (2019/06 #01)
-rw-r--r--whats-cooking.txt173
1 files changed, 62 insertions, 111 deletions
diff --git a/whats-cooking.txt b/whats-cooking.txt
index 82a3076..7f541b4 100644
--- a/whats-cooking.txt
+++ b/whats-cooking.txt
@@ -1,10 +1,10 @@
To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (May 2019, #05; Thu, 30)
-X-master-at: 874dd410cecbc2953f624ab6ab9fda10d1650870
-X-next-at: f4fbbf30c2866bb423731899b666bc3184d8e162
+Subject: What's cooking in git.git (Jun 2019, #01; Mon, 3)
+X-master-at: 74583d89127e21255c12dd3c8a3bf60b497d7d03
+X-next-at: 20b46463406ef6ca70b1a63c5e26d4e2ead8dc13
-What's cooking in git.git (May 2019, #05; Thu, 30)
+What's cooking in git.git (Jun 2019, #01; Mon, 3)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with
@@ -12,9 +12,10 @@ 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 second round of release candidate has been tagged, after
-slipping for several days to merge a handful of last-minute
-regression fixes.
+The third round of release candidate has been tagged, as we decided
+to merge one last minute topic with security implications.
+Hopefully the final will be identical to this one, modulo l10n that
+needs to happen on top.
You can find the changes described here in the integration branches
of the repositories listed at
@@ -24,97 +25,41 @@ of the repositories listed at
--------------------------------------------------
[Graduated to "master"]
-* es/doc-gitsubmodules-markup (2019-05-28) 1 commit
- (merged to 'next' on 2019-05-29 at 695bb51514)
- + gitsubmodules: align html and nroff lists
-
- Doc markup fix.
-
-
-* ja/diff-opt-typofix (2019-05-19) 1 commit
- (merged to 'next' on 2019-05-19 at fedb594191)
- + diff: fix mistake in translatable strings
-
- Typofix.
-
-
-* jh/trace2 (2019-05-28) 1 commit
- (merged to 'next' on 2019-05-29 at 849c4916ac)
- + trace2: fix tracing when NO_PTHREADS is defined
-
- Will merge to 'master'.
-
-
-* js/rebase-config-bitfix (2019-05-28) 1 commit
- (merged to 'next' on 2019-05-29 at 77de6e31b6)
- + rebase: replace incorrect logical negation by correct bitwise one
-
- Will merge to 'master'.
-
-
-* js/rebase-deprecate-preserve-merges (2019-05-28) 3 commits
- (merged to 'next' on 2019-05-29 at d153fc0d44)
- + rebase docs: recommend `-r` over `-p`
- + docs: say that `--rebase=preserve` is deprecated
- + tests: mark a couple more test cases as requiring `rebase -p`
-
- A bit more leftover clean-up to deprepcate "rebase -p".
-
-
-* jt/clone-server-option (2019-05-28) 1 commit
- (merged to 'next' on 2019-05-29 at 30eb487077)
- + fetch-pack: send server options after command
-
- A brown-paper-bag bugfix to a change already in 'master'.
-
-
-* nd/diff-parseopt (2019-05-29) 3 commits
- (merged to 'next' on 2019-05-29 at f9eedc21e3)
- + parse-options: check empty value in OPT_INTEGER and OPT_ABBREV
- + diff-parseopt: restore -U (no argument) behavior
- + diff-parseopt: correct variable types that are used by parseopt
-
- A brown-paper-bag bugfix to a change already in 'master'.
+* cc/list-objects-filter-wo-sparse-path (2019-05-29) 1 commit
+ (merged to 'next' on 2019-05-30 at 5a294203ad)
+ + list-objects-filter: disable 'sparse:path' filters
- Reducing the noise of the bottom-most patch may be desirable, although
- the change itself is not wrong per-se.
+ Disable "--filter=sparse:path=<path>" that would allow reading from
+ paths on the filesystem.
+--------------------------------------------------
+[New Topics]
-* sg/progress-off-by-one-fix (2019-05-28) 1 commit
- (merged to 'next' on 2019-05-29 at 13ea8cc5a5)
- + progress: avoid empty line when breaking the progress line
+* md/list-objects-filter-memfix (2019-05-31) 1 commit
+ - list-objects-filter: correct usage of ALLOC_GROW
- A brown-paper-bag bugfix to a change already in 'master'.
+ The filter_data used in the list-objects-filter (which manages a
+ lazily sparse clone repository) did not use the dynamic array API
+ correctly---'nr' is supposed to point at one past the last element
+ of the array in use. This has been corrected.
+ Will merge to 'next'.
-* sg/trace2-rename (2019-05-28) 2 commits
- (merged to 'next' on 2019-05-29 at ae7aa4b417)
- + trace2: document the supported values of GIT_TRACE2* env variables
- + trace2: rename environment variables to GIT_TRACE2*
- Rename environment variables that are used to control the "trace2"
- mechanism to a more readable name.
+* md/list-objects-filter-parse-msgfix (2019-05-31) 1 commit
+ - list-objects-filter-options: error is localizeable
---------------------------------------------------
-[New Topics]
+ Make an end-user facing message localizable.
-* po/doc-branch (2019-05-29) 1 commit
- - doc branch: provide examples for listing remote tracking branches
+ Will merge to 'next'.
- RFC
+* cm/send-email-document-req-modules (2019-05-31) 1 commit
+ - send-email: update documentation of required Perl modules
-* bb/unicode-12.1-reiwa (2019-05-29) 1 commit
- (merged to 'next' on 2019-05-30 at 016465335c)
- + unicode: update the width tables to Unicode 12.1
-<<
-* bb/unicode-12.1-reiwa (2019-05-29) 1 commit
- - unicode: update the width tables to Unicode 12.1
->>
+ A doc update.
- Update to Unicode 12.1 width table.
-
- Will cook in 'next'.
+ Will merge to 'next'.
--------------------------------------------------
[Stalled]
@@ -200,24 +145,29 @@ of the repositories listed at
--------------------------------------------------
[Cooking]
-* ab/hash-object-doc (2019-05-28) 1 commit
- - hash-object doc: stop mentioning git-cvsimport
-
- Doc update.
+* po/doc-branch (2019-05-29) 1 commit
+ - doc branch: provide examples for listing remote tracking branches
- Will merge to 'next'.
+ RFC
-* cc/list-objects-filter-wo-sparse-path (2019-05-29) 1 commit
- (merged to 'next' on 2019-05-30 at 5a294203ad)
- + list-objects-filter: disable 'sparse:path' filters
+* bb/unicode-12.1-reiwa (2019-05-29) 1 commit
+ (merged to 'next' on 2019-05-30 at 016465335c)
+ + unicode: update the width tables to Unicode 12.1
- Disable "--filter=sparse:path=<path>" that would allow reading from
- paths on the filesystem.
+ Update to Unicode 12.1 width table.
Will cook in 'next'.
+* ab/hash-object-doc (2019-05-28) 1 commit
+ - hash-object doc: stop mentioning git-cvsimport
+
+ Doc update.
+
+ Will merge to 'next'.
+
+
* ds/object-info-for-prefetch-fix (2019-05-28) 1 commit
(merged to 'next' on 2019-05-29 at ee0055b276)
+ sha1-file: split OBJECT_INFO_FOR_PREFETCH
@@ -323,34 +273,37 @@ of the repositories listed at
* mm/p4-unshelve-windows-fix (2019-05-28) 1 commit
- - p4 unshelve: fix "Not a valid object name HEAD0" on Windows
+ (merged to 'next' on 2019-05-31 at d45167d723)
+ + p4 unshelve: fix "Not a valid object name HEAD0" on Windows
The command line to invoke a "git cat-file" command from inside
"git p4" was not properly quoted to protect a caret and running a
broken command on Windows, which has been corrected.
- Will merge to 'next'.
+ Will cook in 'next'.
* pb/request-pull-verify-remote-ref (2019-05-28) 2 commits
- - request-pull: warn if the remote object is not the same as the local one
- - request-pull: quote regex metacharacters in local ref
+ (merged to 'next' on 2019-05-31 at 0f73300dfa)
+ + request-pull: warn if the remote object is not the same as the local one
+ + request-pull: quote regex metacharacters in local ref
"git request-pull" learned to warn when the ref we ask them to pull
from in the local repository and in the published repository are
different.
- Will merge to 'next'.
+ Will cook in 'next'.
* po/git-help-on-git-itself (2019-05-16) 2 commits
- - Doc: git.txt: remove backticks from link and add git-scm.com/docs
- - git.c: show usage for accessing the git(1) help page
+ (merged to 'next' on 2019-05-31 at 455541d73a)
+ + Doc: git.txt: remove backticks from link and add git-scm.com/docs
+ + git.c: show usage for accessing the git(1) help page
"git help git" was hard to discover (well, at least for some
people).
- Will merge to 'next'.
+ Will cook in 'next'.
* sw/git-p4-unshelve-branched-files (2019-05-28) 1 commit
@@ -375,14 +328,15 @@ of the repositories listed at
* xl/record-partial-clone-origin (2019-05-29) 1 commit
- - clone: respect user supplied origin name when setting up partial clone
+ (merged to 'next' on 2019-05-31 at dc291fa199)
+ + clone: respect user supplied origin name when setting up partial clone
When creating a partial clone, the object filtering criteria is
recorded for the origin of the clone, but this incorrectly used a
hardcoded name "origin" to name that remote; it has been corrected
to honor the "--origin <name>" option.
- Will merge to 'next'.
+ Will cook in 'next'.
* ab/fail-prereqs-in-test (2019-05-14) 1 commit
@@ -513,8 +467,8 @@ of the repositories listed at
The commit-graph file is now part of the "files that the runtime
may keep open file descriptors on, all of which would need to be
closed when done with the object store", and the file descriptor to
- an existing commit-graph file now is closed before "gc" finializes
- a new instance to replace it.
+ an existing commit-graph file now is closed before "gc" finalizes a
+ new instance to replace it.
Waiting on ds/commit-graph-write-refactor to stabilize.
@@ -623,16 +577,13 @@ of the repositories listed at
Will cook in 'next'.
-* an/ignore-doc-update (2019-05-08) 1 commit
+* an/ignore-doc-update (2019-05-31) 1 commit
- gitignore.txt: make slash-rules more readable
The description about slashes in gitignore patterns (used to
indicate things like "anchored to this level only" and "only
matches directories") has been revamped.
- Almost there.
- cf. <20190507104507.18735-1-admin@in-ici.net>
-
* en/fast-export-encoding (2019-05-14) 5 commits
(merged to 'next' on 2019-05-16 at c88bd3edb5)