To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Feb 2015, #01; Tue, 3)
-X-master-at: 0d1c285af265459006c012aa4415175c2db961ad
-X-next-at: 303d43c5ff509a8324ff30a824663dd552b0d231
+Subject: What's cooking in git.git (Feb 2015, #02; Thu, 5)
+X-master-at: 9874fca7122563e28d699a911404fc49d2a24f1c
+X-next-at: 4a23b1ac164e66f150700c4fdd659c98940bd4a5
-What's cooking in git.git (Feb 2015, #01; Tue, 3)
+What's cooking in git.git (Feb 2015, #02; Thu, 5)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
-We will see 2.3 final later this week, hopefully.
+Git 2.3 is out. I'll wait for some time for the dust to settle and
+then rewind and rebuild 'next'.
You can find the changes described here in the integration branches
of the repositories listed at
--------------------------------------------------
[New Topics]
-* jc/diff-format-doc (2015-01-28) 1 commit
- - diff-format doc: a score can follow M for rewrite
-
- The documentation incorrectly said that C(opy) and R(ename) are the
- only ones that can be followed by the score number in the output in
- the --raw format.
-
- Will merge to 'next'.
-
-
-* jk/remote-curl-an-array-in-struct-cannot-be-null (2015-01-28) 1 commit
- - do not check truth value of flex arrays
-
- Will merge to 'next'.
-
-
-* jk/status-read-branch-name-fix (2015-01-28) 1 commit
- - read_and_strip_branch: fix typo'd address-of operator
-
- Code to read branch name from various files in .git/ directory
- would have misbehaved if the code to write them left an empty file.
-
- Will merge to 'next'.
-
-
-* ch/new-gpg-drops-rfc-1991 (2015-01-29) 2 commits
- - t/lib-gpg: sanity-check that we can actually sign
- - t/lib-gpg: include separate public keys in keyring.gpg
-
- Older GnuPG implementation may not correctly import the keyring
- material we prepare for the tests to use.
-
- Will merge to 'next'.
-
-
-* jc/apply-beyond-symlink (2015-02-03) 4 commits
- - apply: do not touch a file beyond a symbolic link
- - apply: do not read from beyond a symbolic link
- - apply: do not read from the filesystem under --index
- - apply: reject input that touches outside the working area
-
- "git apply" was not very careful about reading from, removing,
- updating and creating paths outside the working tree (under
- --index/--cached) or the current directory (when used as a
- replacement for GNU patch).
-
- May need to re-review the tests.
-
-
-* jc/diff-b-m (2015-02-01) 1 commit
- - diff: do not use creation-half of -B as a rename target candidate
-
- "git diff -B -M" produced incorrect patch when the postimage of a
- completely rewritten file is similar to the preimage of a removed
- file; such a resulting file must not be expressed as a rename from
- other place.
-
- The fix in this patch is broken, unfortunately.
-
-
-* jc/remote-set-url-doc (2015-01-29) 1 commit
- - Documentation/git-remote.txt: stress that set-url is not for triangular
-
- Clarify in the documentation that "remote.<nick>.pushURL" and
- "remote.<nick>.URL" are there to name the same repository accessed
- via different transports, not two separate repositories.
+* jc/diff-files-ita (2015-02-04) 1 commit
+ - run_diff_files(): clarify computation of sha1 validity
Will merge to 'next'.
-* jc/t4122-use-test-write-lines (2015-01-28) 1 commit
- - t4122: use test_write_lines from test-lib-functions
-
- Will merge to 'next'.
-
-
-* jk/pack-bitmap (2015-02-03) 1 commit
- - [NEEDS SOB] ewah: fix building with gcc < 3.4.0
-
- Need to get the S-o-by and Acked-by straightend out.
-
-
-* jk/prune-mtime (2015-02-02) 1 commit
- - sha1_file: fix iterating loose alternate objects
-
- In v2.2.0, we broke "git prune" that runs in a repository that
- borrows from an alternate object store.
+* jk/config-no-ungetc-eof (2015-02-05) 2 commits
+ - config_buf_ungetc: warn when pushing back a random character
+ - config: do not ungetc EOF
Will merge to 'next'.
-* ps/submodule-sanitize-path-upon-add (2015-02-02) 1 commit
- - git-submodule.sh: fix '/././' path normalization
+* jk/decimal-width-for-uintmax (2015-02-05) 1 commit
+ - decimal_width: avoid integer overflow
Will merge to 'next'.
-* tc/curl-vernum-output-broken-in-7.11 (2015-02-03) 1 commit
- - Makefile: handle broken curl version number in version check
-
- Cope with irregular output of "curl-config --vernum" given by
- certain older vintages of cURL.
+* ss/check-builtins-on-windows (2015-02-05) 1 commit
+ - check-builtins: strip executable suffix $X when enumerating builtins
Will merge to 'next'.
-
-* tc/missing-http-proxyauth (2015-02-03) 1 commit
- - http: support curl < 7.10.7
-
- Will merge to 'next'.
-
-
-* tc/t9001-noxmailer (2015-01-30) 1 commit
- - t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
-
- Kyle's update to explicitly support --no-option with older
- Getopt::Long ($gmane/263203) might be a better alternative
- if we have to support them in the longer term.
-
--------------------------------------------------
[Stalled]
--------------------------------------------------
[Cooking]
+* jc/diff-format-doc (2015-01-28) 1 commit
+ - diff-format doc: a score can follow M for rewrite
+
+ The documentation incorrectly said that C(opy) and R(ename) are the
+ only ones that can be followed by the score number in the output in
+ the --raw format.
+
+ Will merge to 'next'.
+
+
+* jk/remote-curl-an-array-in-struct-cannot-be-null (2015-01-28) 1 commit
+ - do not check truth value of flex arrays
+
+ Will merge to 'next'.
+
+
+* jk/status-read-branch-name-fix (2015-01-28) 1 commit
+ - read_and_strip_branch: fix typo'd address-of operator
+
+ Code to read branch name from various files in .git/ directory
+ would have misbehaved if the code to write them left an empty file.
+
+ Will merge to 'next'.
+
+
+* ch/new-gpg-drops-rfc-1991 (2015-01-29) 2 commits
+ - t/lib-gpg: sanity-check that we can actually sign
+ - t/lib-gpg: include separate public keys in keyring.gpg
+
+ Older GnuPG implementation may not correctly import the keyring
+ material we prepare for the tests to use.
+
+ Will merge to 'next'.
+
+
+* jc/apply-beyond-symlink (2015-02-03) 4 commits
+ - apply: do not touch a file beyond a symbolic link
+ - apply: do not read from beyond a symbolic link
+ - apply: do not read from the filesystem under --index
+ - apply: reject input that touches outside the working area
+
+ "git apply" was not very careful about reading from, removing,
+ updating and creating paths outside the working tree (under
+ --index/--cached) or the current directory (when used as a
+ replacement for GNU patch).
+
+ May need to re-review the tests.
+
+
+* jc/diff-b-m (2015-02-01) 1 commit
+ - diff: do not use creation-half of -B as a rename target candidate
+
+ "git diff -B -M" produced incorrect patch when the postimage of a
+ completely rewritten file is similar to the preimage of a removed
+ file; such a resulting file must not be expressed as a rename from
+ other place.
+
+ The fix in this patch is broken, unfortunately.
+
+
+* jc/remote-set-url-doc (2015-01-29) 1 commit
+ - Documentation/git-remote.txt: stress that set-url is not for triangular
+
+ Clarify in the documentation that "remote.<nick>.pushURL" and
+ "remote.<nick>.URL" are there to name the same repository accessed
+ via different transports, not two separate repositories.
+
+ Will merge to 'next'.
+
+
+* jc/t4122-use-test-write-lines (2015-01-28) 1 commit
+ - t4122: use test_write_lines from test-lib-functions
+
+ Will merge to 'next'.
+
+
+* jk/pack-bitmap (2015-02-04) 1 commit
+ - ewah: fix building with gcc < 3.4.0
+
+ Will merge to 'next'.
+
+
+* jk/prune-mtime (2015-02-02) 1 commit
+ - sha1_file: fix iterating loose alternate objects
+
+ In v2.2.0, we broke "git prune" that runs in a repository that
+ borrows from an alternate object store.
+
+ Will merge to 'next'.
+
+
+* ps/submodule-sanitize-path-upon-add (2015-02-02) 1 commit
+ - git-submodule.sh: fix '/././' path normalization
+
+ Will merge to 'next'.
+
+
+* tc/curl-vernum-output-broken-in-7.11 (2015-02-03) 1 commit
+ - Makefile: handle broken curl version number in version check
+
+ Cope with irregular output of "curl-config --vernum" given by
+ certain older vintages of cURL.
+
+ Will merge to 'next'.
+
+
+* tc/missing-http-proxyauth (2015-02-03) 1 commit
+ - http: support curl < 7.10.7
+
+ Will merge to 'next'.
+
+
+* tc/t9001-noxmailer (2015-01-30) 1 commit
+ - t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
+
+ Kyle's update to explicitly support --no-option with older
+ Getopt::Long ($gmane/263203) might be a better alternative
+ if we have to support them in the longer term.
+
+
* jc/apply-ws-fix-expands-report (2015-01-22) 1 commit
- apply: detect and mark whitespace errors in context lines when fixing
(this branch uses jc/apply-ws-fix-expands.)
(merged to 'next' on 2015-01-23 at ed972d3)
+ git-p4: correct --prepare-p4-only instructions
- Will merge to 'master' after 2.3 final.
+ Will merge to 'master'.
* mg/commit-author-no-match-malformed-message (2015-01-26) 1 commit
* ld/p4-exclude-in-sync (2015-01-28) 2 commits
- - git-p4: correct "exclude" change
+ (merged to 'next' on 2015-02-05 at ab410a1)
+ + git-p4: correct "exclude" change
(merged to 'next' on 2015-01-22 at f6f1fc7)
+ git-p4: support excluding paths on sync
- Will squash into one after 2.3 final.
+ Will squash them into one and then merge to 'master'.
* tb/connect-ipv6-parse-fix (2015-01-22) 3 commits
- dir.c: optionally compute sha-1 of a .gitignore file
Need extra set of eyes to review this.
-
---------------------------------------------------
-[Discarded]
-
-* jc/push-cert-hmac-optim (2014-09-25) 2 commits
- . receive-pack: truncate hmac early and convert only necessary bytes
- . sha1_to_hex: split out "hex-format n bytes" helper and use it
-
- This is "we could do this if we wanted to", not "we measured and it
- improves performance critical codepath".
-
-
-* mt/patch-id-stable (2014-06-10) 1 commit
- . patch-id: change default to stable
-
- Nobody seems to be jumping up & down requesting this last step,
- which makes the result somewhat backward incompatible.
-
-
-* sb/copy-fd-errno (2014-11-17) 1 commit
- . copy.c: make copy_fd preserve meaningful errno
-
-
-* cj/grep-none-match (2015-01-06) 1 commit
- . git-log: added --none-match option
-
- "git log --none-match --grep=WIP" will show only commits that are
- not marked as WIP.
-
- cj/log-invert-grep replaces this.
-
-
-* lf/blame-commit-label (2015-01-12) 1 commit
- . blame.c: fix garbled error message
-
- jk/blame-commit-label replaces this.
projects / thirdparty / git.git / commitdiff
