Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while 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.
As -rc2 has slipped by a few days, the final is also slipping by
a couple of days to give the last-minute fixes. Hopefully we can
see the final one within 48 hours ;-)
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--
[Graduated to "master"]
* ab/cred-netrc-no-autodie (2018-06-13) 1 commit
(merged to 'next' on 2018-06-14 at 68171b82a7)
+ git-credential-netrc: remove use of "autodie"
Hotfix for contrib/ stuff broken by this cycle.
* es/make-no-iconv (2018-06-15) 1 commit
(merged to 'next' on 2018-06-18 at b53e9933c9)
+ Makefile: make NO_ICONV really mean "no iconv"
"make NO_ICONV=NoThanks" did not override NEEDS_LIBICONV
(i.e. linkage of -lintl, -liconv, etc. that are platform-specific
tweaks), which has been corrected.
* jk/ewah-bounds-check (2018-06-18) 2 commits
(merged to 'next' on 2018-06-18 at bf606be1bb)
+ ewah: adjust callers of ewah_read_mmap()
+ ewah_read_mmap: bounds-check mmap reads
(this branch is used by ds/ewah-cleanup.)
The code to read compressed bitmap was not careful to avoid reading
past the end of the file, which has been corrected.
* jl/zlib-restore-nul-termination (2018-06-13) 1 commit
(merged to 'next' on 2018-06-14 at 3fa108363e)
+ packfile: correct zlib buffer handling
Make zlib inflate codepath more robust against versions of zlib
that clobber unused portion of outbuf.
* js/rebase-i-root-fix (2018-06-18) 2 commits
(merged to 'next' on 2018-06-18 at a6a1cf01d5)
+ rebase --root: fix amending root commit messages
+ rebase --root: demonstrate a bug while amending root commit messages
A regression to "rebase -i --root" introduced during this cycle has
been fixed.
* km/doc-workflows-typofix (2018-06-12) 1 commit
(merged to 'next' on 2018-06-13 at 21e6a8e67b)
+ gitworkflows: fix grammar in 'Merge upwards' rule
Typofix.
* ks/branch-set-upstream (2018-06-18) 1 commit
(merged to 'next' on 2018-06-18 at 83b0b87013)
+ t3200: clarify description of --set-upstream test
A test title has been reworded to clarify it.
* ld/git-p4-updates (2018-06-12) 6 commits
(merged to 'next' on 2018-06-13 at 4f7e24b3c4)
+ git-p4: auto-size the block
+ git-p4: narrow the scope of exceptions caught when parsing an int
+ git-p4: raise exceptions from p4CmdList based on error from p4 server
+ git-p4: better error reporting when p4 fails
+ git-p4: add option to disable syncing of p4/master with p4
+ git-p4: disable-rebase: allow setting this via configuration
(this branch uses rm/p4-submit-with-commit-option.)
"git p4" updates.
* mw/doc-merge-enumfix (2018-06-14) 1 commit
(merged to 'next' on 2018-06-14 at 7074d6d48e)
+ doc: update the order of the syntax `git merge --continue`
Fix old merge glitch in Documentation during v2.13-rc0 era.
* rd/comment-typofix-in-sha1-file (2018-06-04) 1 commit
(merged to 'next' on 2018-06-13 at 38ef825556)
+ sha1-file.c: correct $GITDIR to $GIT_DIR in a comment
In code comment typofix
* rd/diff-options-typofix (2018-06-11) 1 commit
(merged to 'next' on 2018-06-13 at a5aa58fa1b)
+ diff-options.txt: fix minor typos, font inconsistencies, in docs
Typofix.
* rd/doc-remote-tracking-with-hyphen (2018-06-13) 1 commit
(merged to 'next' on 2018-06-14 at 013aa6912e)
+ Use hyphenated "remote-tracking branch" (docs and comments)
Doc update.
* rm/p4-submit-with-commit-option (2018-06-12) 1 commit
(merged to 'next' on 2018-06-13 at d3a272c733)
+ git-p4: add options --commit and --disable-rebase
(this branch is used by ld/git-p4-updates.)
"git p4" updates.
* sb/blame-color (2018-06-14) 1 commit
(merged to 'next' on 2018-06-14 at f8cd824d4d)
+ blame: release string_list after use in parse_color_fields()
Leakfix.
* sg/t7406-chain-fix (2018-06-18) 1 commit
(merged to 'next' on 2018-06-18 at 816d976ea6)
+ t7406-submodule-update: fix broken &&-chains
Test fix.
--
[New Topics]
* en/rename-directory-detection-reboot (2018-06-18) 1 commit
(merged to 'next' on 2018-06-18 at 95c454d3f4)
+ merge-recursive: use xstrdup() instead of fixed buffer
Newly added codepath in merge-recursive had potential buffer
overrun, which has been fixed.
Will merge to 'master'.
* tz/cred-netrc-cleanup (2018-06-18) 3 commits
- git-credential-netrc: fix exit status when tests fail
- git-credential-netrc: use in-tree Git.pm for tests
- git-credential-netrc: minor whitespace cleanup in test script
Build and test procedure for netrc credential helper (in contrib/)
has been updated.
