From: Junio C Hamano Date: Mon, 30 Jul 2012 21:33:34 +0000 (-0700) Subject: What's cooking (2012/07 #10) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=278423a19948140208650a1056ca86fb9e7f43c6;p=thirdparty%2Fgit.git What's cooking (2012/07 #10) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 27950ad347..bc920d0089 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,17 +1,18 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Jul 2012, #09; Sun, 29) -X-master-at: 425b8a22aa14d624c807d5eed92c92f5cd32f376 -X-next-at: 3dac0f9a513f5cb0b8689ff36862dd53759d52e3 +Subject: What's cooking in git.git (Jul 2012, #10; Mon, 30) +X-master-at: 3b2d763db07f251e424d7f940938d9df1e1d4d09 +X-next-at: 9b27acc1daac188eab79350fdb996c3f148dd5ab -What's cooking in git.git (Jul 2012, #09; Sun, 29) +What's cooking in git.git (Jul 2012, #10; Mon, 30) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. -We are getting closer to 1.7.12-rc1; I do not see any topic in -'next' (let alnoe 'pu') right now that is so urgent that cannot wait -until the next release. +The tip of 'master' as of this writing is 1.7.12-rc1, and the tip of +'maint' is 1.7.11.4. From now on until the final release, no further +updates, except for the two i18n topics and obviously correct fixes +to regressions, will be merged to 'master'. You can find the changes described here in the integration branches of the repositories listed at @@ -19,90 +20,40 @@ repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -------------------------------------------------- -[New Topics] - -* mz/cherry-code-cleanup (2012-07-29) 3 commits - - cherry: remove redundant check for merge commit - - cherry: don't set ignored rev_info options - - remove unnecessary parameter from get_patch_ids() - -Minor code clean-up on the cherry-pick codepath. -Not urgent. - -* nd/maint-i18n-diffstat (2012-07-26) 1 commit - - i18n: leave \n out of translated diffstat - -Will merge to 'next' and then down to 'master' by 1.7.2-rc1. +[Graduated to "master"] * hv/link-alt-odb-entry (2012-07-29) 1 commit - - link_alt_odb_entry: fix read over array bounds reported by valgrind + + link_alt_odb_entry: fix read over array bounds reported by valgrind The code to avoid mistaken attempt to add the object directory itself as its own alternate could read beyond end of a string while -comparison. The patch is different from what was posted by Heiko. - -Waiting for comments. - -* jc/maint-config-exit-status (2012-07-29) 1 commit - - config: "git config baa" should exit with status 1 - -The exit status code from "git config" was way overspecified while -being incorrect. Update the implementation to give the documented -status for a case that was documented, and introduce a new code for -"all other errors". - -* jk/maint-null-in-trees (2012-07-29) 3 commits - - fsck: detect null sha1 in tree entries - - do not write null sha1s to on-disk index - - diff: do not use null sha1 as a sentinel value - -"git diff" used incorrectly an all-NUL object name as sentinel. +comparison. * rj/maint-grep-remove-redundant-test (2012-07-29) 1 commit - - t7810-*.sh: Remove redundant test + + t7810-*.sh: Remove redundant test "git grep" stopped spawning an external "grep" long time ago, but a duplicated test to check internal and external "grep" was left behind. -------------------------------------------------- -[Graduated to "master"] - -* 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 - -In a superproject that has repository outside of its working tree, -"git submodule add" failed to clone a new submodule, as GIT_DIR and -GIT_WORK_TREE environment variables necessary to work in such a -superproject interfered with access to the submodule repository. - -* 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 - -Fix test breakages by a builder who does not have a valid user name -in his /etc/password entry. +[New Topics] -* 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 +* jc/maint-t7406-rev-parse-max-count-huh (2012-07-30) 1 commit + (merged to 'next' on 2012-07-30 at 9b27acc) + + t7406: fix misleading "rev-parse --max-count=1 HEAD" -Plug a few trivial memory leaks. +Test clean-up, with no behaviour change. +Not urgent. -* 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 +* jk/maint-diff-nul40-as-sentinel (2012-07-29) 1 commit + + diff: do not use null sha1 as a sentinel value + (this branch is used by jk/maint-null-in-trees.) -"git checkout " to come back from a detached HEAD state -incorrectly computed reachability of the detached HEAD, resulting in -unnecessary warnings. +"git diff" had a confusion between taking data from a path in the +working tree and taking data from an object that happens to have +name 0{40} recorded in a tree. +Not urgent. -------------------------------------------------- [Stalled] @@ -202,14 +153,54 @@ working :-<. -------------------------------------------------- [Cooking] +* mz/cherry-code-cleanup (2012-07-29) 3 commits + - cherry: remove redundant check for merge commit + - cherry: don't set ignored rev_info options + - remove unnecessary parameter from get_patch_ids() + +Minor code clean-up on the cherry-pick codepath. +Not urgent. + +* nd/maint-i18n-diffstat (2012-07-26) 1 commit + (merged to 'next' on 2012-07-30 at 0da57ef) + + i18n: leave \n out of translated diffstat + +Will merge after 1.7.11-rc1 +together with jx/i18n-1.7.11 topic, as they will affect i18n/l10n +teams. + +* jc/maint-config-exit-status (2012-07-30) 1 commit + (merged to 'next' on 2012-07-30 at 8392da9) + + config: "git config baa" should exit with status 1 + +The exit status code from "git config" was way overspecified while +being incorrect. Update the implementation to give the documented +status for a case that was documented, and introduce a new code for +"all other errors". + +Not urgent. + +* jk/maint-null-in-trees (2012-07-29) 2 commits + (merged to 'next' on 2012-07-30 at 771c497) + + fsck: detect null sha1 in tree entries + + do not write null sha1s to on-disk index + (this branch uses jk/maint-diff-nul40-as-sentinel.) + +We do not want a link to 0{40} object stored anywhere in our objects. + +Not urgent. + * 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. -* jc/test-prereq (2012-07-27) 6 commits +* jc/test-prereq (2012-07-30) 7 commits + (merged to 'next' on 2012-07-30 at b7c6949) + + t3910: use the UTF8_NFD_TO_NFC test prereq (merged to 'next' on 2012-07-27 at 448cbbc) + test-lib: provide UTF8 behaviour as a prerequisite + t0050: use the SYMLINKS test prereq @@ -244,16 +235,18 @@ temporary copy of the working tree when available. Not urgent. * jx/i18n-1.7.11 (2012-07-26) 7 commits - - i18n: merge-recursive: mark strings for translation - - Remove dead code which contains bad gettext block - - i18n: am: mark more strings for translation - - rebase: remove obsolete and unused LONG_USAGE which breaks xgettext - - i18n: Rewrite gettext messages start with dash - - i18n: rebase: mark messages for translation - - i18n: New keywords for xgettext extraction from sh - -Is this ready for 'next'? -Not urgent. + (merged to 'next' on 2012-07-30 at 3c00929) + + i18n: merge-recursive: mark strings for translation + + Remove dead code which contains bad gettext block + + i18n: am: mark more strings for translation + + rebase: remove obsolete and unused LONG_USAGE which breaks xgettext + + i18n: Rewrite gettext messages start with dash + + i18n: rebase: mark messages for translation + + i18n: New keywords for xgettext extraction from sh + +Will merge after 1.7.11-rc1 +together with nd/maint-i18n-diffstat topic, as they will affect i18n/l10n +teams. * jk/no-more-pre-exec-callback (2012-06-05) 1 commit (merged to 'next' on 2012-07-23 at fe59cb6) @@ -266,27 +259,3 @@ Will defer for 6 months until ancient "less" goes extinct. + push: start warning upcoming default change for push.default Will defer for another cycle. - --------------------------------------------------- -[Discarded] - -* jk/maint-commit-abandoned-message (2012-07-23) 2 commits - . commit: give a hint when a commit message has been abandoned - . Merge commit 'b2eda9b' into jk/maint-commit-abandoned-message - -* 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.) - -Already in 'master' via Eric's git-svn tree. - -* 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.) - -Already in 'master' via Eric's git-svn tree.