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 first release candidate 2.4-rc1 has been tagged. I'll still
take small and trivial fixes and documentation updates but let's
really shift our focus to find and fix (or revert) regressions
that may have happened during this 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
--
[New Topics]
* va/fix-git-p4-tests (2015-03-28) 2 commits
- git-p4: fix copy detection test
- t9814: fix broken shell syntax in git-p4 rename test
Test fixes for git-p4
Will merge to 'next'.
* va/p4-client-path (2015-03-28) 2 commits
- git-p4: improve client path detection when branches are used
- t9801: check git-p4's branch detection and client view together
Attempt to better handle branches in perforce by git p4
Reviews by git-p4 experts are very much appreciated.
* 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
Will merge to 'master'.
* jk/at-push-sha1 (2015-03-31) 6 commits
- sha1_name: implement @{push} shorthand
- sha1_name: refactor upstream_mark
- remote.c: provide per-branch pushremote name
- remote.c: hoist branch.*.remote lookup out of remote_get_1
- remote.c: drop "remote" pointer from "struct branch"
- remote.c: drop default_remote_name variable
* 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
Will merge to 'master'.
* jk/sha1-file-reduce-useless-warnings (2015-03-30) 1 commit
- sha1_file: squelch "packfile cannot be accessed" warnings
* 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"
Will merge to 'master'.
* mh/show-branch-topic (2015-03-31) 1 commit
- show-branch: show all local heads when only giving one rev along --topics
"git show-branch --topics HEAD" (with no other arguments) did not
do anything interesting. Instead, contrast the given revision
against all the local branches by default.
Will merge to 'next'.
* 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
Will merge to 'master'.
* sb/line-log-plug-pairdiff-leak (2015-03-30) 1 commit
- line-log.c: fix a memleak
Will merge to 'next'.
* sb/plug-wt-shortstatus-tracking-leak (2015-03-30) 1 commit
- wt-status.c: fix a memleak
Will merge to 'next'.
* jc/push-cert (2015-04-02) 1 commit
- push --signed: tighten what the receiving end can ask to sign
The "git push --signed" protocol extension did not limit what the
"nonce" that is a server-chosen string can contain or how long it
can be, which was unnecessarily lax. Limit both the length and the
alphabet to a reasonably small space that can still have enough
entropy.
Will merge to 'next'.
* jc/update-instead-into-void (2015-04-01) 1 commit
- 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.
Will merge to 'next'.
* jk/init-core-worktree-at-root (2015-04-02) 1 commit
- init: don't set core.worktree when initializing /.git
We avoid setting core.worktree when the repository location is the
".git" directory directly at the top level of the working tree, but
the code misdetected the case in which the working tree is at the
root level of the filesystem (which arguably is a silly thing to
do, but still valid).
Will merge to 'next'.
* jk/pack-corruption-post-mortem (2015-04-01) 1 commit
- howto: document more tools for recovery corruption
Documentation update.
Will merge to 'next'.
* jn/doc-fast-import-no-16-octopus-limit (2015-03-31) 1 commit
- fast-import doc: remove suggested 16-parent limit
Documentation update.
Will merge to 'next'.
* sb/plug-streaming-leak (2015-03-31) 1 commit
- streaming.c: fix a memleak
Will merge to 'next'.
* ts/checkout-advice-plural (2015-04-01) 1 commit
- checkout: call a single commit “it” instead of “th
Will merge to 'next'.
--
[Graduated to "master"]
* ph/push-doc-cas (2015-03-26) 1 commit
(merged to 'next' on 2015-03-27 at 0737697)
+ git-push.txt: clean up force-with-lease wording
Documentation update.
* sb/leaks (2015-03-24) 10 commits
(merged to 'next' on 2015-03-24 at bdbc0c7)
+ http: release the memory of a http pack request as well
(merged to 'next' on 2015-03-23 at 5397daf)
+ read-cache: fix memleak
+ add_to_index(): free unused cache-
