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.
We passed -rc2 mark; there are still a few hotfixes that correct
obvious bugs introduced during this cycle in trivial ways that need
to be merged before the final, and I also need to pull the i18n/l10n
updates, but other than that, I think we are in relatively good
shape given the upcoming release is fairly a big one judging from
historical norms. Knock, knock...
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"]
* jk/index-pack-maint (2018-06-11) 3 commits
(merged to 'next' on 2018-06-11 at f85a566b11)
+ index-pack: correct install_packed_git() args
(merged to 'next' on 2018-06-04 at c553a485e8)
+ index-pack: handle --strict checks of non-repo packs
+ prepare_commit_graft: treat non-repository as a noop
"index-pack --strict" has been taught to make sure that it runs the
final object integrity checks after making the freshly indexed
packfile available to itself.
* jk/submodule-fsck-loose-fixup (2018-06-11) 2 commits
(merged to 'next' on 2018-06-11 at 3eadb39c0a)
+ fsck: avoid looking at NULL blob->object
+ t7415: don't bother creating commit for symlink test
Finishing touches to a topic that already is in 'maint'.
* sb/submodule-merge-in-merge-recursive (2018-06-11) 1 commit
(merged to 'next' on 2018-06-11 at ad05b6bc6a)
+ merge-submodule: reduce output verbosity
Finishing touches to a topic that already is in 'master'.
* sg/completion-zsh-workaround (2018-06-12) 1 commit
(merged to 'next' on 2018-06-12 at 331a1db143)
+ completion: correct zsh detection when run from git-completion.zsh
Work around zsh segfaulting when loading git-completion.zsh
--
[New Topics]
* 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.
Will merge to 'master'.
* 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.
Will merge to 'master'.
* 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.
Will merge to 'master'.
* en/rename-directory-detection (2018-06-14) 1 commit
(merged to 'next' on 2018-06-14 at 0e4c6bd117)
+ 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'.
* 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.
Will merge to 'master'.
* 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.
Will merge to 'master'.
* ks/branch-set-upstream (2018-06-14) 1 commit
- t3200: clarify description of --set-upstream test
A test title has been reworded to clarify it.
* jt/fetch-pack-negotiator (2018-06-15) 7 commits
- fetch-pack: introduce negotiator API
- fetch-pack: move common check and marking together
- fetch-pack: make negotiation-related vars local
- fetch-pack: use ref adv. to prune "have" sent
- fetch-pack: directly end negotiation if ACK ready
- fetch-pack: clear marks before re-marking
- fetch-pack: split up everything_local()
Code restructuring and a small fix to transport protocol v2 during
fetching.
* ag/rebase-i-append-todo-help (2018-06-14) 2 commits
- rebase--interactive: rewrite append_todo_help() in C
- Merge branch 'ag/rebase-p' into ag/rebase-i-append-todo-help
(this branch is used by ag/rebase-i-rewrite-todo; uses ag/rebase-p.)
Stepwise rewriting of the machinery of "rebase -i" into C continues.
* ag/rebase-i-rewrite-todo (2018-06-15) 3 commits
- rebase--interactive: rewrite the edit-todo functionality in C
- editor: add a function to launch the sequence editor
- Merge branch 'bc/t3430-fixup' into ag/rebase-i-rewrite-todo
(this branch uses ag/rebase-i-append-todo-help and ag/rebase-p.)
Stepwise rewriting of the machinery of "rebase -i" into C continues.
* sb/fix-fetching-moved-submodules (2018-06-14) 2 commits
- t5526: test recursive submodules when fetching moved submodules
