Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
Please consider that the tip of 'master' is more or less feature
complete. Topics that are not in 'next' by the time I tag -rc1
sometime early next week will not likely to be part of upcoming
1.7.12 release.
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]
* dg/submodule-in-dismembered-working-tree (2012-07-25) 1 commit
(merged to 'next' on 2012-07-26 at cfa16c4)
+ git-submodule: work with GIT_DIR/GIT_WORK_TREE
Will merge to 'master'.
* jk/help-plug-memleak (2012-07-25) 2 commits
(merged to 'next' on 2012-07-26 at bd57cb8)
+ help.c::exclude_cmds(): plug a leak
+ help.c::uniq: plug a leak
Will merge to 'master'.
* jk/maint-checkout-orphan-check-fix (2012-07-25) 1 commit
(merged to 'next' on 2012-07-26 at a513c5a)
+ checkout: don't confuse ref and object flags
Will merge to 'master', later down to older maintenance releases.
* ms/makefile-pl (2012-07-25) 3 commits
- The Makefile.PL will now find .pm files itself.
- Don't lose Error.pm if $@ gets clobbered.
- Quiet warning if Makefile.PL is run with -w and no --localedir
(this branch is used by ms/git-svn-pm.)
Will be part of larger series around git-svn, so I'll most likely
drop this copy and wait for Eric to feed it to me later.
* ms/git-svn-pm (2012-07-26) 4 commits
- Move initialization of Git::SVN variables into Git::SVN.
- Extract Git::SVN from git-svn into its own .pm file.
- Prepare Git::SVN for extraction into its own file.
- Extract some utilities from git-svn to allow extracting Git::SVN.
(this branch uses ms/makefile-pl.)
Will be part of larger series around git-svn, so I'll most likely
drop this copy and wait for Eric to feed it to me later.
* sz/submodule-force-update (2012-07-25) 1 commit
(merged to 'next' on 2012-07-26 at 3bda2be)
+ Make 'git submodule update --force' always check out submodules.
We may want a documentation update and a few tests on top.
Not urgent.
* jk/autoident-test (2012-07-26) 6 commits
(merged to 'next' on 2012-07-26 at f358a28)
+ t7502: test early quit from commit with bad ident
+ t7502: handle systems where auto-identity is broken
+ t7502: drop confusing test_might_fail call
+ t7502: narrow checks for author/committer name in template
+ t7502: properly quote GIT_EDITOR
+ t7502: clean up fake_editor tests
Will merge to 'master'.
* jc/test-prereq (2012-07-26) 6 commits
(merged to 'next' on 2012-07-26 at 0e21c36)
+ test-lib: provide UTF8 behaviour as a prerequisite
+ t0050: use the SYMLINKS test prereq
+ t0050: use the CASE_INSENSITIVE_FS test prereq
+ test-lib: provide case insensitivity as a prerequisite
+ test: allow prerequisite to be evaluated lazily
+ test: rename $satisfied to $satisfied_prereq
Teaches the test framework to probe rarely used prerequistes lazily,
and make use of it for detecting SYMLINKS, CASE_INSENSITIVE_FS and
NKD/NKC MacOS x gotcha.
Not urgent.
--
[Graduated to master]
* cw/rebase-i-root (2012-07-24) 1 commit
(merged to 'next' on 2012-07-24 at 01b7c29)
+ rebase -i: handle fixup of root commit correctly
Finishing touches to the rebase -i --root (new feature for
1.7.12).
* jc/mergetool-tool-help (2012-07-23) 1 commit
(merged to 'next' on 2012-07-23 at ef256fc)
+ mergetool: support --tool-help option like difftool does
git mergetool did not support --tool-help option to give the list
of supported backends, like git difftool does.
* jc/test-lib-source-build-options-early (2012-06-24) 1 commit
(merged to 'next' on 2012-07-24 at 97078b5)
+ test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier
Reorders t/test-lib.sh so that we dot-source GIT-BUILD-OPTIONS that
records the shell and Perl the user told us to use with Git a lot
early, so that test-lib.sh script itself can use $PERL_PATH in
one of its early operations.
* jk/maint-advise-vaddf (2012-07-23) 1 commit
(merged to 'next' on 2012-07-23 at 5b13a77)
+ advice: pass varargs to strbuf_vaddf, not strbuf_addf
(this branch is used by jk/maint-commit-abandoned-message.)
The advise() function did not use varargs correctly to format
its message.
* jk/maint-commit-check-committer-early (2012-07-23) 1 commit
(merged to 'next' on 2012-07-23 at a2c7133)
+ commit: check committer identity more strictly
git commit --amend let the user edit the log message and then died
when the human-readable committer name was given insufficiently by
getpwent(3).
* jk/maint-commit-document-editmsg (2012-07-23) 1 commit
(merged to 'next' on 2012-07-23 at 06307fb)
+ commit: document the temporary commit message file
Document $GIT_DIR/COMMIT_EDITMSG file.
* mh/maint-revisions-doc (2012-07-24) 2 commits
