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 second release candidate 2.4-rc2 has been tagged. There were a
few more topics I felt are safe to merge, but they had updates to
translatable strings, which would add last-minute burden to our l10n
teams, so they are held back for the remainder of the cycle.
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]
* iu/fix-parse-options-h-comment (2015-03-29) 1 commit
(merged to 'next' on 2015-04-02 at 7fd3cef)
+ parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval
* jc/update-instead-into-void (2015-04-01) 1 commit
(merged to 'next' on 2015-04-08 at 8ef4e15)
+ push-to-deploy: allow pushing into an unborn branch and updating it
A push into an unborn branch, with receive.denyCurrentBranch set
to updateInstead, did not check out the working tree as expected.
* jk/cherry-pick-docfix (2015-03-30) 1 commit
(merged to 'next' on 2015-04-02 at 40da1d7)
+ cherry-pick: fix docs describing handling of empty commits
* jk/colors (2015-04-04) 1 commit
(merged to 'next' on 2015-04-08 at 9b9e6f2)
+ diff-highlight: do not split multibyte characters
diff-highlight (in contrib/) used to show byte-by-byte
differences, which meant that multi-byte characters can be chopped
in the middle. It learned to pay attention to character boundaries
(assuming the UTF-8 payload).
* jk/merge-quiet (2015-04-02) 1 commit
(merged to 'next' on 2015-04-08 at 6475433)
+ merge: pass verbosity flag down to merge-recursive
git merge --quiet did not squelch messages from the underlying
merge-recursive strategy.
* jk/pack-corruption-post-mortem (2015-04-01) 1 commit
(merged to 'next' on 2015-04-08 at 890c04e)
+ howto: document more tools for recovery corruption
Documentation update.
* jn/doc-fast-import-no-16-octopus-limit (2015-03-31) 1 commit
(merged to 'next' on 2015-04-08 at 341ca70)
+ fast-import doc: remove suggested 16-parent limit
Documentation update.
* jz/gitweb-conf-doc-fix (2015-03-31) 1 commit
(merged to 'next' on 2015-04-02 at 237d1bc)
+ gitweb.conf.txt: say build-time, not built-time
Documentation update.
* pt/enter-repo-comment-fix (2015-03-31) 1 commit
(merged to 'next' on 2015-04-02 at 276ad7e)
+ enter_repo(): fix docs to match code
Documentation update.
* sb/plug-streaming-leak (2015-03-31) 1 commit
(merged to 'next' on 2015-04-08 at 226bdd8)
+ streaming.c: fix a memleak
* sb/plug-wt-shortstatus-tracking-leak (2015-03-30) 1 commit
(merged to 'next' on 2015-04-08 at bd6291b)
+ wt-status.c: fix a memleak
--
[New Topics]
* ah/usage-strings (2015-04-02) 2 commits
- branch: fix funny-sounding error message
- standardize usage strings that were missed the first time
A few usage string updates.
Will hold.
* jk/reading-packed-refs (2015-04-05) 6 commits
- refname_is_safe: avoid expensive normalize_path_copy call
- t1430: add another refs-escape test
- strbuf: add an optimized 1-character strbuf_grow
- strbuf_getwholeline: use getc_unlocked
- git-compat-util: add fallbacks for unlocked stdio
- strbuf_getwholeline: use getc macro
An earlier rewrite to use strbuf_getwholeline() instead of fgets(3)
to read packed-refs file revealed that the former is unacceptably
inefficient.
There were further discussions on this topic to use getdelim(3).
$gmane/266932
Expecting a reroll.
* kk/log-merges-config (2015-04-04) 5 commits
- bash-completion: add support for git-log --merges= and log.merges
- t4202-log: add tests for --merges=
- Documentation: add git-log --merges= option and log.merges config. var
- log: honor log.merges= option
- revision: add --merges={show|only|hide} option
git log (but not other commands in the log family) learned to
pay attention to the log.merges configuration variable that can be
set to show (the normal behaviour), only (hide non-merge
commits), or hide (hide merge commits). --merges=(show|only|hide)
can be used to override the setting from the command line.
The documentation may need to be updated once more.
* kn/cat-file-literally (2015-04-05) 5 commits
- SQUASH???
- t1006: add tests for git cat-file --literally
- cat-file: add documentation for '--literally' option.
- cat-file: teach cat-file a '--literally' option
- sha1_file.c: support reading from a loose object of unknown type
Add the --literally option to cat-file to allow inspecting
loose objects of an experimental or a broken type.
This is v7 $gmane/266761; getting closer to the final, I would say.
* ld/p4-filetype-detection (2015-04-04) 3 commits
(merged to 'next' on 2015-04-08 at da735b4)
+ git-p4: fix filetype detection on files
