From 894e5064a55d38af82cd8ae1c654e42027555b07 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 14 Mar 2012 16:04:38 -0700 Subject: [PATCH] What's cooking (2012/03 #06) --- whats-cooking.txt | 304 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 192 insertions(+), 112 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 5d4c40008c..c7e8f3bc04 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,18 +1,17 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Mar 2012, #05; Sun, 11) -X-master-at: 745950ce0e7e984158a00cd52c5811918d1f3495 -X-next-at: d9e556f99f2727d7117df36b37a2b6c7907f9d2f +Subject: What's cooking in git.git (Mar 2012, #06; Wed, 14) +X-master-at: 0e2d57fd50f61e668be3180bc8f25991ea88aa8c +X-next-at: 38e1251a4abf75d6f2ce839f27cea2f57690fd15 -What's cooking in git.git (Mar 2012, #05; Sun, 11) +What's cooking in git.git (Mar 2012, #06; Wed, 14) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. -I think the tip of 'master' is more or less complete for -rc1; I'll -start ignoring new feature patches out of blue and low impact fix -patches that are not very well cooked, expecting for them to be -rerolled after 1.7.10 final. +As of tonight, the tip of master is 1.7.10-rc1 and I'll start ignoring new +feature patches out of blue and low impact fix patches that are not very +well cooked, expecting for them to be rerolled after 1.7.10 final. You can find the changes described here in the integration branches of the repositories listed at @@ -20,68 +19,121 @@ repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -------------------------------------------------- -[New Topics] +[Graduated to "master"] -* ab/perl-i18n (2012-03-10) 3 commits - - fixup! de1e4ae - - perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER - - Git::I18N: compatibility with perl <5.8.3 +* az/verify-tag-use-gpg-config (2012-03-08) 1 commit + (merged to 'next' on 2012-03-09 at d9e556f) + + verify-tag: Parse GPG configuration options. -Attempts to help installations with ancient Perl and/or without -MakeMaker. Didn't quite work for me, so I tried to queue a fix-up -commit, but an independent confirmation report is needed before it -is squashed into Ævar's patches. +"git tag -s" honored "gpg.program" configuration variable since +1.7.9, but "git tag -v" and "git verify-tag" didn't. -* jc/commit-hook-authorship (2012-03-11) 3 commits - - commit: pass author/committer info to hooks - - t7503: does pre-commit-hook learn authorship? - - ident.c: add split_ident_line() to parse formatted ident line - (this branch is tangled with jc/run-hook-env-1.) +This is a fairly low impact fix. -"git commit --author=$name" did not tell the name that was being -recorded in the resulting commit to hooks, even though it does do so -when the end user overrode the authorship via the "GIT_AUTHOR_NAME" -environment variable. This is a simpler of the two approaches. +* jc/i18n-shell-script-gettext (2012-03-12) 1 commit + (merged to 'next' on 2012-03-12 at 1326b5e) + + i18n: fix auto detection of gettext scheme for shell scripts -* jc/run-hook-env-1 (2012-03-11) 4 commits - . commit: pass author/committer info to hooks - - run_hook(): enhance the interface to pass arbitrary environment - - t7503: does pre-commit-hook learn authorship? - - ident.c: add split_ident_line() to parse formatted ident line - (this branch is tangled with jc/commit-hook-authorship.) +The auto detection was testing if a fixed string that is known to be +non-empty is empty by mistake. -Addresses the same issue, sharing the first two changes with the -previous one, but uses a more complex approach, which may not be -worth the complexity. The third patch is a prerequiste for the -fourth one (not used), but is independently useful. +* jc/maint-undefined-i18n-observation-test (2012-03-09) 1 commit + (merged to 'next' on 2012-03-12 at 42aaabe) + + t0204: clarify the "observe undefined behaviour" test -* jn/maint-fast-import-empty-ls (2012-03-09) 2 commits - - fast-import: don't allow 'ls' of path with empty components - - fast-import: leakfix for 'ls' of dirty trees +It was unclear what a test in t0204 wanted to check; it turns out +that it was only to observe an undefined behaviour of the system, +and did not anticipate one kind of reasonable error behaviour. -* ms/maint-config-error-at-eol-linecount (2012-03-11) 1 commit - - config: report errors at the EOL with correct line number +Replaces the tb/maint-remove-irrelevant-i18n-test topic. -* jc/diff-algo-cleanup (2012-02-19) 2 commits - - xdiff: PATIENCE/HISTOGRAM are not independent option bits - - xdiff: remove XDL_PATCH_* macros - (this branch is used by jc/diff-ignore-case.) +* ms/maint-config-error-at-eol-linecount (2012-03-12) 1 commit + (merged to 'next' on 2012-03-12 at ba17441) + + config: report errors at the EOL with correct line number -Resurrects the preparatory clean-up patches from another topic -that was discarded. +When "git config" diagnoses an error in a configuration file and +shows the line number for the offending line, it miscounted if the +error was at the end of line. -* cn/apply-fix-ws-can-lengthen-lines (2012-03-11) 1 commit - . apply: reallocate the postimage buffer when needed +* ph/rerere-doc (2012-03-08) 1 commit + (merged to 'next' on 2012-03-12 at 2456f65) + + rerere: Document 'rerere remaining' -Attempts to address an ancient bug that dates back to the addition -of an oddball "tab-in-indent" whitespace breakage class that wants -to have longer lines than the original when fixing things up. +-------------------------------------------------- +[New Topics] -Needs more work; results in double-frees. +* jh/notes-merge-in-git-dir-worktree (2012-03-12) 2 commits + - notes-merge: use opendir/readdir instead of using read_directory() + - t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/ + +Running "notes merge --commit" failed to perform correctly when run +from any directory inside $GIT_DIR/. When "notes merge" stops with +conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits +to resolve it. + +Not urgent. + +* jn/diffstat-tests (2012-03-13) 7 commits + - diffstat summary line varies by locale: miscellany + - test: use numstat instead of diffstat in binary-diff test + - test: use --numstat instead of --stat in "git stash show" tests + - test: test cherry-pick functionality and output separately + - test: modernize funny-names test style + - test: use numstat instead of diffstat in funny-names test + - test: use test_i18ncmp when checking --stat output + +Some tests checked the "diff --stat" output when they do not have to, +which unnecessarily made things harder to verify under GETTEXT_POISON. +Not urgent. + +* th/doc-diff-submodule-option (2012-03-14) 1 commit + (merged to 'next' on 2012-03-14 at 0e1d755) + + Documentation/diff-options: reword description of --submodule option + +Update "diff --submodule" documentation. +May want to ship with 1.7.10. + +* th/git-diffall (2012-03-14) 5 commits + (merged to 'next' on 2012-03-14 at 38e1251) + + contrib/diffall: fix cleanup trap on Windows + + contrib/diffall: eliminate duplicate while loops + + contrib/diffall: eliminate use of tar + + contrib/diffall: create tmp dirs without mktemp + + contrib/diffall: comment actual reason for 'cdup' + +Update sample "diffall" script. +May want to ship with 1.7.10. + +* tr/maint-word-diff-regex-sticky (2012-03-14) 3 commits + - diff: tweak a _copy_ of diff_options with word-diff + - diff: refactor the word-diff setup from builtin_diff_cmd + - t4034: diff.*.wordregex should not be "sticky" in --word-diff + +The regexp configured with wordregex was incorrectly reused across +files. +Not urgent. + +* zj/test-cred-helper-nicer-prove (2012-03-14) 3 commits + - t0303: resurrect commit message as test documentation + - fixup? + - t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER + +Minor improvement to t0303. +Not urgent. -------------------------------------------------- [Stalled] +* ab/perl-i18n (2012-03-10) 3 commits + - fixup! de1e4ae + - perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER + - Git::I18N: compatibility with perl <5.8.3 + +Attempts to help installations with ancient Perl and/or without +MakeMaker. Didn't quite work for me, so I tried to queue a fix-up +commit, but an independent confirmation report is needed before it +is squashed into Ævar's patches. + * dg/test-from-elsewhere (2012-03-04) 2 commits - Support out-of-tree Valgrind tests - Allow overriding GIT_BUILD_DIR @@ -92,26 +144,14 @@ directory other than $(pwd)/.., an out of place test script can reach test helpers and freshly built Git relative to it (GIT_BUILD_DIR is a mere short-hand for $TEST_DIRECTORY/..). -* nd/optim-connected (2012-02-29) 1 commit - - Perform cheaper connectivity check when pack is used as medium - -Cheats the local connectivity check performed by "git fetch" -slightly to gain some performance. This is a bit iffy. +* cn/apply-fix-ws-can-lengthen-lines (2012-03-11) 1 commit + . apply: reallocate the postimage buffer when needed -* nd/columns (2012-02-28) 10 commits - - tag: add --column - - column: support piping stdout to external git-column process - - status: add --column - - branch: add --column - - help: reuse print_columns() for help -a - - column: add column.ui for default column output settings - - column: add dense layout support - - column: add columnar layout - - Stop starting pager recursively - - Add git-column for columnar display +Attempts to address an ancient bug that dates back to the addition +of an oddball "tab-in-indent" whitespace breakage class that wants +to have longer lines than the original when fixing things up. -Rerolled; the configuration handling looked iffy, but otherwise well -explained. +Needs more work; results in double-frees. * hv/submodule-recurse-push (2012-02-13) 3 commits - push: teach --recurse-submodules the on-demand option @@ -125,12 +165,8 @@ The bottom one was not clearly explained and needs a reroll. Peff had a good suggestion outlining an updated code structure so that somebody new can try to dip his or her toes in the development. -Any takers? -* jh/trace-use-startup-info (2012-03-02) 1 commit - - Use startup_info->prefix rather than prefix. - -I tend to agree with the doubt of the author of this patch expressed. +A rework is being attempted by Christopher Tiwald. * ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits - fixup! 15eaaf4 @@ -176,24 +212,79 @@ not working :-(. -------------------------------------------------- [Cooking] -* rs/unpack-trees-leakfix (2012-03-06) 1 commit - (merged to 'next' on 2012-03-07 at 69a69cd) - + unpack-trees: plug minor memory leak +* nd/columns (2012-03-13) 12 commits + - column: support grouping entries + - column: support "denser" mode + - ls-files: support --column + - tag: add --column + - column: support piping stdout to external git-column process + - status: add --column + - branch: add --column + - help: reuse print_columns() for help -a + - column: add dense layout support + - column: add columnar layout + - Stop starting pager recursively + - Add column layout skeleton and git-column + +Rerolled again. Modulo minor nits, looked nicer than the previous round. + +* nd/optim-connected (2012-03-14) 1 commit + - {fetch,receive}-pack: skip sha-1 integrity test on objects from new pack + +Optimizes the local connectivity check performed by "git fetch" and "git +receive-pack" that is run in response to "git push". + +* jc/commit-hook-authorship (2012-03-11) 3 commits + (merged to 'next' on 2012-03-12 at 05ca7f8) + + commit: pass author/committer info to hooks + + t7503: does pre-commit-hook learn authorship? + + ident.c: add split_ident_line() to parse formatted ident line + (this branch is tangled with jc/run-hook-env-1.) + +"git commit --author=$name" did not tell the name that was being +recorded in the resulting commit to hooks, even though it does do so +when the end user overrode the authorship via the "GIT_AUTHOR_NAME" +environment variable. This is a simpler of the two approaches. Will defer til 1.7.10. +* jc/run-hook-env-1 (2012-03-11) 4 commits + . commit: pass author/committer info to hooks + - run_hook(): enhance the interface to pass arbitrary environment + + t7503: does pre-commit-hook learn authorship? + + ident.c: add split_ident_line() to parse formatted ident line + (this branch is tangled with jc/commit-hook-authorship.) + +Addresses the same issue as jc/commit-hook-authorship, sharing the first +two changes with the previous one, but uses a more complex approach, which +may not be worth the complexity. The third patch is a prerequiste for the +fourth one (not used), but is independently useful. + +* jn/maint-fast-import-empty-ls (2012-03-09) 2 commits + - fast-import: don't allow 'ls' of path with empty components + - fast-import: leakfix for 'ls' of dirty trees + +fast-import did not diagnose "ls ''" that asks an empty path +as an error. + +* jc/diff-algo-cleanup (2012-02-19) 2 commits + - xdiff: PATIENCE/HISTOGRAM are not independent option bits + - xdiff: remove XDL_PATCH_* macros + (this branch is used by jc/diff-ignore-case.) + +Resurrects the preparatory clean-up patches from another topic +that was discarded. + * jh/apply-free-patch (2012-03-07) 1 commit - apply: do not leak patches and fragments -* az/verify-tag-use-gpg-config (2012-03-08) 1 commit - (merged to 'next' on 2012-03-09 at d9e556f) - + verify-tag: Parse GPG configuration options. +Will defer til 1.7.10. -"git tag -s" honored "gpg.program" configuration variable since -1.7.9, but "git tag -v" and "git verify-tag" didn't. +* rs/unpack-trees-leakfix (2012-03-06) 1 commit + (merged to 'next' on 2012-03-07 at 69a69cd) + + unpack-trees: plug minor memory leak -This is a fairly low impact fix. -Will merge to 'master'. +Will defer til 1.7.10. * tb/maint-remove-irrelevant-i18n-test (2012-03-06) 1 commit (merged to 'next' on 2012-03-07 at 23f2dd1) @@ -202,17 +293,6 @@ Will merge to 'master'. I tentatively parked this in 'next' but later reverted the merge. Will discard. -* jc/maint-undefined-i18n-observation-test (2012-03-09) 1 commit - - t0204: clarify the "observe undefined behaviour" test - -It was unclear what a test in t0204 wanted to check; it turns out -that it was only to observe an undefined behaviour of the system, -and did not anticipate one kind of reasonable error behaviour. - -Replaces the tb/maint-remove-irrelevant-i18n-test topic. - -We may want merge this before 1.7.10 to help Mac OS X builders. - * mm/push-default-switch-warning (2012-03-09) 1 commit - push: start warning upcoming default change for push.default @@ -223,38 +303,33 @@ similar issue. The latter is a lower impact patch that uses a more focused approach to limit the scope to the target audience that actually needs help. -* ph/rerere-doc (2012-03-08) 1 commit - - rerere: Document 'rerere remaining' - -Ping? - * sl/customize-sane-tool-path (2012-03-09) 1 commit - configure: allow user to prevent $PATH "sanitization" on Solaris Would be nice to hear from people who actually use autoconf, either on Solaris or other platforms. -* jc/fmt-merge-msg-people (2012-03-08) 3 commits - (merged to 'next' on 2012-03-08 at be31aa9) - + fmt-merge-msg.c: make util_as_int() return "int" - (merged to 'next' on 2012-03-07 at 76fbac3) - + fmt-merge-msg: finishing touches - (merged to 'next' on 2012-03-05 at 38de349) - + fmt-merge-msg: show those involved in a merged series +* jc/fmt-merge-msg-people (2012-03-13) 1 commit + - fmt-merge-msg: show those involved in a merged series + +Rerolled. The "fmt-merge-msg" command learns to list the primary contributors involved in the side topic you are merging. Will defer til 1.7.10. -* nl/http-proxy-more (2012-03-05) 3 commits +* nl/http-proxy-more (2012-03-14) 5 commits + - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY + - http: Avoid limit of retrying request only twice - http: handle proxy authentication failure (error 407) - http: handle proxy proactive authentication - http: try http_proxy env var when http.proxy config option is not set The code to talk to http proxies learn to use the same credential -API used to talk to the final http destinations. It seems the -re-rolling has stalled since the last review? +API used to talk to the final http destinations. + +Will defer til 1.7.10. * nd/stream-more (2012-03-07) 7 commits (merged to 'next' on 2012-03-07 at 7325922) @@ -291,3 +366,8 @@ Ramsey. . xdiff: introduce XDF_INEXACT_MATCH - xdiff: PATIENCE/HISTOGRAM are not independent option bits - xdiff: remove XDL_PATCH_* macros + +* jh/trace-use-startup-info (2012-03-02) 1 commit + . Use startup_info->prefix rather than prefix. + +I tend to agree with the doubt of the author of this patch expressed. -- 2.11.4.GIT