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 is expected to happen this weekend.
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]
* bc/gpg-sign-everywhere (2014-01-27) 9 commits
- pull: add the --gpg-sign option.
- rebase: add the --gpg-sign option
- rebase: parse options in stuck-long mode
- rebase: don't try to match -M option
- rebase: remove useless arguments check
- am: add the --gpg-sign option
- am: parse options in stuck-long mode
- git-sh-setup.sh: add variable to use the stuck-long mode
- cherry-pick, revert: add the --gpg-sign option
Teach "--gpg-sign" option to many commands that create commits.
Changes to some scripted Porcelains use unsafe variable
substitutions and need to be tightened.
Waiting for a reroll.
* ds/rev-parse-required-args (2014-01-28) 1 commit
- rev-parse: check i before using argv[i] against argc
"git rev-parse --default" without the required option argument did
not diagnose it as an error.
Will merge to 'next'.
* jk/config-path-include-fix (2014-01-28) 2 commits
- handle_path_include: don't look at NULL value
- expand_user_path: do not look at NULL path
include.path variable (or any variable that expects a path that can
use ~username expansion) in the configuration file is not a
boolean, but the code failed to check it.
Will merge to 'next'.
* jk/repack-honor-pack-keep (2014-01-28) 1 commit
- repack: add `repack.honorpackkeep` config var
(this branch uses jk/pack-bitmap.)
Optionally allow "git repack" to include objects that exist in kept
packs in newly created packfiles.
Waiting for response to review comments.
* nd/submodule-pathspec-ending-with-slash (2014-01-27) 8 commits
- clean: use cache_name_is_other()
- clean: replace match_pathspec() with dir_path_match()
- Pass directory indicator to match_pathspec_item()
- match_pathspec: match pathspec "foo/" against directory "foo"
- dir.c: prepare match_pathspec_item for taking more flags
- Rename match_pathspec_depth() to match_pathspec()
- Convert some match_pathspec_depth() to dir_path_match()
- Convert some match_pathspec_depth() to ce_path_match()
Allow "git cmd path/", when the 'path' is where a submodule is
bound to the top-level working tree, to match 'path', despite the
extra and unnecessary trailing slash.
Will merge to 'next'.
--
[Stalled]
* jk/color-for-more-pagers (2014-01-17) 4 commits
- pager: disable colors for some known-bad configurations
- DONOTMERGE: needs matching change to git-sh-setup
- setup_pager: set MORE=R
- setup_pager: refactor LESS/LV environment setting
'more' implementation of BSD wants to be told with MORE=R
environment before it shows colored output, while 'more' on some
other platforms will die when seeing MORE=R environment.
It appears that we are coming to the consensus that trying to be
too intimately knowledgeable about quirks of various pager
implementations on different platforms is a losing proposition.
Waiting for a reroll.
* po/everyday-doc (2014-01-27) 1 commit
- Make 'git help everyday' work
This may make the said command to emit something, but the source is
not meant to be formatted into a manual pages to begin with, and
also its contents are a bit stale. It may be a good first step in
the right direction, but needs more work to at least get the
mark-up right before public consumption.
Will hold.
* jk/branch-at-publish-rebased (2014-01-17) 5 commits
- t1507 (rev-parse-upstream): fix typo in test title
- implement @{publish} shorthand
- branch_get: provide per-branch pushremote pointers
- branch_get: return early on error
- sha1_name: refactor upstream_mark
Give an easier access to the tracking branches from "other" side in
a triangular workflow by introducing B@{publish} that works in a
similar way to how B@{upstream} does.
Will hold.
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
- merge: drop unused arg from abort_commit method signature
- merge: make prepare_to_commit responsible for write_merge_state
- t7505: ensure cleanup after hook blocks merge
- t7505: add missing &&
Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
run during "git merge". The log message stresses too much on one
hook, prepare-commit-msg, but it would equally apply to other hooks
like post-merge, I think.
Waiting for a reroll.
* jl/submodule-recursive-checkout (2013-12-26) 5 commits
- Teach checkout to recursively checkout submodules
- submodule: teach unpack_trees() to update submodules
- submodule: teach unpack_trees() to repopulate submodules
- submodule: teach unpack_trees() to remove submodule c
