From: Junio C Hamano Date: Sat, 10 Mar 2012 01:29:32 +0000 (-0800) Subject: What's cooking (2012/03 #04) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45b40c809a7ad62feb8ffc34721d15cb8ecd2501;p=thirdparty%2Fgit.git What's cooking (2012/03 #04) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 793bd20771..830f71f5a8 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,23 +1,17 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Mar 2012, #03; Mon, 5) -X-master-at: 2980b0de1b387e4f9a63c50ca741271990c849d5 -X-next-at: 38de349d595af3563cafab5297cbad2f3e920499 +Subject: What's cooking in git.git (Mar 2012, #04; Fri, 9) +X-master-at: 745950ce0e7e984158a00cd52c5811918d1f3495 +X-next-at: d9e556f99f2727d7117df36b37a2b6c7907f9d2f -What's cooking in git.git (Mar 2012, #03; Mon, 5) +What's cooking in git.git (Mar 2012, #04; Fri, 9) -------------------------------------------------- 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 tip of 'next' as of tonight is more or less how 1.7.10-rc0 will -look like in a few days. I do not have enough confidence on other -large-ish topics that are not yet in 'next'. - -Small, trivially correct topics that have high value/damage ratio -however may have enough time to go in 1.7.10 final even if they are -still in 'pu', if the owners put enough effort in them. Otherwise -let's throw them into Stalled category and leave them to the next -cycle. +Trivially correct fixes to old bugs may still graduate to 'master', +but otherwise we are mostly in "regression fixes only" mode until +1.7.10 final (see http://tinyurl.com/gitCal for schedule). You can find the changes described here in the integration branches of the repositories listed at @@ -27,54 +21,184 @@ repositories listed at -------------------------------------------------- [New Topics] -* jc/fmt-merge-msg-people (2012-03-05) 1 commit - (merged to 'next' on 2012-03-05 at 38de349) - + fmt-merge-msg: show those involved in a merged series +* rs/unpack-trees-leakfix (2012-03-06) 1 commit + (merged to 'next' on 2012-03-07 at 69a69cd) + + unpack-trees: plug minor memory leak -The "fmt-merge-msg" command learns to list the primary contributors -involved in the side topic you are merging. +* jh/apply-free-patch (2012-03-07) 1 commit + - apply: do not leak patches and fragments -* nl/http-proxy-more (2012-03-05) 3 commits - - 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 - (this branch uses nl/http-proxy-auth.) +* 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. -The code to talk to http proxies learn to use the same credential -API used to talk to the final http destinations. +"git tag -s" honored "gpg.program" configuration variable since +1.7.9, but "git tag -v" and "git verify-tag" didn't. + +This is a fairly low impact fix, and we may want to have it in +1.7.10. + +* tb/maint-remove-irrelevant-i18n-test (2012-03-06) 1 commit + (merged to 'next' on 2012-03-07 at 23f2dd1) + + t0204: remove a test that checks undefined behaviour + +I tentatively parked this in 'next' but later reverted the merge. + +* jc/maint-undefined-i18n-observation-test (2012-03-09) 1 commit + - t0204: clarify the "observe undefined behaviour" test -* nd/stream-more (2012-03-05) 6 commits - - fsck: use streaming API for writing lost-found blobs - - show: use streaming API for showing blobs - - parse_object: avoid putting whole blob in core - - cat-file: use streaming API to print blobs - - Add more large blob test cases - - streaming: make streaming-write-entry to be more reusable +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. -As I do not think changes in the original larger series that touch -index-pack and unpack-objects will be ready for the upcoming 1.7.10, -I've picked up only bits that deal with "use streaming API instead -of reading things in core" and minimally fixed them up. These we -should be able to polish in time. +Replaces the tb/maint-remove-irrelevant-i18n-test topic. -The "test cases" patch needs to be trimmed to cover only these, I -would think. +* mm/push-default-switch-warning (2012-03-09) 1 commit + - push: start warning upcoming default change for push.default + +This resurrects an ancient patch I wrote during a discussion we had +in the 1.6.3-1.6.4 era. It also conflicts with the long-stalled +jc/advise-push-default topic and for a good reason. 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' + +* 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. + +-------------------------------------------------- +[Graduated to "master"] + +* cn/pull-rebase-message (2012-03-04) 1 commit + (merged to 'next' on 2012-03-04 at 5a6cd58) + + Make git-{pull,rebase} message without tracking information friendlier + +The advise message given when the user didn't give enough clue on what +to merge was overly long. + +* jc/maint-diff-patch-header (2012-03-01) 3 commits + (merged to 'next' on 2012-03-02 at 2cd2059) + + diff -p: squelch "diff --git" header for stat-dirty paths + + t4011: illustrate "diff-index -p" on stat-dirty paths + + t4011: modernise style + (this branch is used by jc/diff-ignore-mode.) + +"diff-index" and friends showed "diff --git" header and nothing else +for a path that is only stat-dirty. + +* jc/pickaxe-ignore-case (2012-03-04) 3 commits + (merged to 'next' on 2012-03-04 at 1ad3a39) + + ctype.c: Fix a sparse warning + (merged to 'next' on 2012-03-02 at 73a632b) + + pickaxe: allow -i to search in patch case-insensitively + + grep: use static trans-case table + +"git log -G/-S" pays attention to the "-i" option. + +* jh/threadable-symlink-check (2012-03-02) 1 commit + (merged to 'next' on 2012-03-05 at fdd667c) + + Add threaded versions of functions in symlinks.c. + +It probably is "threadble" not "threaded" but in any case this +should not regress the current callers. + +* jl/maint-submodule-relative (2012-03-04) 4 commits + (merged to 'next' on 2012-03-07 at e020e5c) + + submodules: fix ambiguous absolute paths under Windows + + submodules: refactor computation of relative gitdir path + + submodules: always use a relative path from gitdir to work tree + + submodules: always use a relative path to gitdir + +The whole directory that houses a top-level superproject managed by +"git submodule" can be moved to another place. + +* jn/maint-do-not-match-with-unsanitized-searchtext (2012-03-06) 1 commit + (merged to 'next' on 2012-03-06 at 768ce21) + + gitweb: Fix fixed string (non-regexp) project search + +"gitweb" did use quotemeta() to prepare search string when asked to +do a fixed-string project search, but did not use it by mistake and +used the user-supplied string instead. + +* kb/maint-prune-rmdir-closedir (2012-03-07) 1 commit + (merged to 'next' on 2012-03-07 at 2438c9a) + + fix deletion of .git/objects sub-directories in git-prune/repack + +Call closedir() that iterates over a directory before rmdir() it. + +* nl/http-proxy-auth (2012-03-02) 1 commit + (merged to 'next' on 2012-03-04 at f368669) + + http: support proxies that require authentication + (this branch is used by nl/http-proxy-more.) + +Allow curl-based transport to use proxies that require authentication. + +* sl/modern-t0000 (2012-03-02) 1 commit + (merged to 'next' on 2012-03-04 at 2cd1508) + + t0000: modernise style + +* th/mergetools-deltawalker (2012-03-05) 1 commit + (merged to 'next' on 2012-03-05 at 167c74f) + + mergetools: add a plug-in to support DeltaWalker + +Add plug-in to support DeltaWalker in difftool/mergetool. + +* tr/maint-bundle-boundary (2012-03-01) 3 commits + (merged to 'next' on 2012-03-02 at c25692f) + + bundle: keep around names passed to add_pending_object() + + t5510: ensure we stay in the toplevel test dir + + t5510: refactor bundle->pack conversion + +"git bundle" did not record boundary commits correctly when there +are many of them. + +* vr/branch-doc (2012-03-06) 3 commits + (merged to 'next' on 2012-03-06 at 6be3587) + + Documentation/git-branch: add default for --contains + + Documentation/git-branch: fix a typo + + Documentation/git-branch: cleanups + +Documentation update. + +* zj/diff-stat-dyncol (2012-03-01) 10 commits + (merged to 'next' on 2012-03-01 at 79b4152) + + diff --stat: add config option to limit graph width + + diff --stat: enable limiting of the graph part + + diff --stat: add a test for output with COLUMNS=40 + + diff --stat: use a maximum of 5/8 for the filename part + + merge --stat: use the full terminal width + + log --stat: use the full terminal width + + show --stat: use the full terminal width + + diff --stat: use the full terminal width + + diff --stat: tests for long filenames and big change counts + + Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scaler + +Rerolled again and looking good. -------------------------------------------------- [Stalled] +* dg/test-from-elsewhere (2012-03-04) 2 commits + - Support out-of-tree Valgrind tests + - Allow overriding GIT_BUILD_DIR + +Better support for out-of-tree test scripts, but it appears that the +approach needs to be rethought. By repointing TEST_DIRECTORY to a +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. -* jc/diff-ignore-mode (2012-03-01) 1 commit - - diff --ignore-mode-change - (this branch uses jc/maint-diff-patch-header.) - -Will discard. - * nd/columns (2012-02-28) 10 commits - tag: add --column - column: support piping stdout to external git-column process @@ -90,17 +214,6 @@ Will discard. Rerolled; the configuration handling looked iffy, but otherwise well explained. -* jc/diff-ignore-case (2012-02-28) 6 commits - - diff: -i is "--ignore-case" but means a bit more in "log" - - diff: --ignore-case - - xdiff: introduce XDF_IGNORE_CASE - - xdiff: introduce XDF_INEXACT_MATCH - - xdiff: PATIENCE/HISTOGRAM are not independent option bits - - xdiff: remove XDL_PATCH_* macros - -"git diff" learns "--ignore-case" option. -Will discard, as nobody seems to need this. - * hv/submodule-recurse-push (2012-02-13) 3 commits - push: teach --recurse-submodules the on-demand option - Refactor submodule push check to use string list instead of integer @@ -112,8 +225,8 @@ The bottom one was not clearly explained and needs a reroll. - push: hint to use push.default=upstream when appropriate 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? +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. @@ -164,70 +277,41 @@ not working :-(. -------------------------------------------------- [Cooking] -* cn/pull-rebase-message (2012-03-04) 1 commit - (merged to 'next' on 2012-03-04 at 5a6cd58) - + Make git-{pull,rebase} message without tracking information friendlier - -The advise message given when the user didn't give enough clue on what -to merge was overly long. -Will merge to 'master'. - -* dg/test-from-elsewhere (2012-03-04) 2 commits - - Support out-of-tree Valgrind tests - - Allow overriding GIT_BUILD_DIR - -Better support for out-of-tree test scripts. - -* jh/threadable-symlink-check (2012-03-02) 1 commit - (merged to 'next' on 2012-03-05 at fdd667c) - + Add threaded versions of functions in symlinks.c. - -It probably is "threadble" not "threaded" but in any case this -should not regress the current callers. - -* jn/maint-do-not-match-with-unsanitized-searchtext (2012-03-04) 1 commit - - gitweb: Fix fixed string (non-regexp) project search - -"gitweb" did use quotemeta() to prepare search string when asked to -do a fixed-string project search, but did not use it by mistake and -used the user-supplied string instead. - -I would love to see this in 1.7.10; what I queued for 'maint' (that -does not have the lazy fill-info stuff), and my conflict resolution -into 'pu' to adjust for lazy fill-info, are both correct, I think, -but please double check. - -* nl/http-proxy-auth (2012-03-02) 1 commit - (merged to 'next' on 2012-03-04 at f368669) - + http: support proxies that require authentication - (this branch is used by nl/http-proxy-more.) - -Allow curl-based transport to use proxies that require authentication. -Will merge to 'master'. - -* sl/modern-t0000 (2012-03-02) 1 commit - (merged to 'next' on 2012-03-04 at 2cd1508) - + t0000: modernise style - -Will merge to 'master'. - -* th/mergetools-deltawalker (2012-03-05) 1 commit - (merged to 'next' on 2012-03-05 at 167c74f) - + mergetools: add a plug-in to support DeltaWalker +* 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 -Add plug-in to support DeltaWalker in difftool/mergetool. -Will merge to 'master'. +The "fmt-merge-msg" command learns to list the primary contributors +involved in the side topic you are merging. -* jl/maint-submodule-relative (2012-03-04) 4 commits - - submodules: fix ambiguous absolute paths under Windows - - submodules: refactor computation of relative gitdir path - - submodules: always use a relative path from gitdir to work tree - - submodules: always use a relative path to gitdir +Judging by the rate of "oops, this is better" fix-ups, it was good +that I decided to postpone this topic til the next cycle ;-) -Rerolled and resurrected from Stalled category. +* nl/http-proxy-more (2012-03-05) 3 commits + - 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 -I would love to have this in 1.7.10; a couple of Acks from different -platforms and success reports would be very helpful. +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? + +* nd/stream-more (2012-03-07) 7 commits + (merged to 'next' on 2012-03-07 at 7325922) + + update-server-info: respect core.bigfilethreshold + + fsck: use streaming API for writing lost-found blobs + + show: use streaming API for showing blobs + + parse_object: avoid putting whole blob in core + + cat-file: use streaming API to print blobs + + Add more large blob test cases + + streaming: make streaming-write-entry to be more reusable + +Use API to read blob data in smaller chunks in more places to +reduce the memory footprint. * nd/threaded-index-pack (2012-03-02) 2 commits - index-pack: support multithreaded delta resolving @@ -238,52 +322,19 @@ resurrected from Stalled category, but I am reluctant to advance a topic that can easily break many people's repositories at this late in the cycle. -* jc/maint-diff-patch-header (2012-03-01) 3 commits - (merged to 'next' on 2012-03-02 at 2cd2059) - + diff -p: squelch "diff --git" header for stat-dirty paths - + t4011: illustrate "diff-index -p" on stat-dirty paths - + t4011: modernise style - (this branch is used by jc/diff-ignore-mode.) - -"diff-index" and friends showed "diff --git" header and nothing else -for a path that is only stat-dirty. - -Should be safe, but is not urgent. - -* tr/maint-bundle-boundary (2012-03-01) 3 commits - (merged to 'next' on 2012-03-02 at c25692f) - + bundle: keep around names passed to add_pending_object() - + t5510: ensure we stay in the toplevel test dir - + t5510: refactor bundle->pack conversion - -"git bundle" did not record boundary commits correctly when there -are many of them. +What is queued here is a couple of review cycles old; will discard +and replace with a re-roll when it comes. -Will merge to 'master'. - -* jc/pickaxe-ignore-case (2012-03-04) 3 commits - (merged to 'next' on 2012-03-04 at 1ad3a39) - + ctype.c: Fix a sparse warning - (merged to 'next' on 2012-03-02 at 73a632b) - + pickaxe: allow -i to search in patch case-insensitively - + grep: use static trans-case table - -"git log -G/-S" pays attention to the "-i" option. - -Will merge to 'master'. +-------------------------------------------------- +[Discarded] -* zj/diff-stat-dyncol (2012-03-01) 10 commits - (merged to 'next' on 2012-03-01 at 79b4152) - + diff --stat: add config option to limit graph width - + diff --stat: enable limiting of the graph part - + diff --stat: add a test for output with COLUMNS=40 - + diff --stat: use a maximum of 5/8 for the filename part - + merge --stat: use the full terminal width - + log --stat: use the full terminal width - + show --stat: use the full terminal width - + diff --stat: use the full terminal width - + diff --stat: tests for long filenames and big change counts - + Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scaler +* jc/diff-ignore-case (2012-02-28) 6 commits + . diff: -i is "--ignore-case" but means a bit more in "log" + . diff: --ignore-case + . xdiff: introduce XDF_IGNORE_CASE + . xdiff: introduce XDF_INEXACT_MATCH + . xdiff: PATIENCE/HISTOGRAM are not independent option bits + . xdiff: remove XDL_PATCH_* macros -Rerolled again and looking good. -Will merge to 'master'. +* jc/diff-ignore-mode (2012-03-01) 1 commit + . diff --ignore-mode-change