From fa8727c618eb17290ee325d258b58701296ff653 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 27 Jul 2011 17:05:29 -0700 Subject: [PATCH] What's cooking (2011/07 #04) --- whats-cooking.txt | 448 ++++++++++++++++++++++------------------------ 1 file changed, 217 insertions(+), 231 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 660ae7d573..110d8a27ae 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,104 +1,198 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Jul 2011, #03; Wed, 20) -X-master-at: d79bcd68056250d7c03bf9b12728ee2fd85a0ab3 -X-next-at: e1ef4147bce8b10d938f988e64e2adfef7cb94eb +Subject: What's cooking in git.git (Jul 2011, #04; Wed, 27) +X-master-at: 4db0d0d1ba94c08f9476c7adff61375a752b154d +X-next-at: 013d7d08533ebc8b58e6e42cfdba28f2f4817be6 -What's cooking in git.git (Jul 2011, #03; Wed, 20) +What's cooking in git.git (Jul 2011, #04; Wed, 27) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' while commits prefixed with '+' are in 'next'. +-------------------------------------------------- +[New Topics] + +* jc/streaming-filter (2011-07-22) 1 commit + (merged to 'next' on 2011-07-22 at 2081cd7) + + streaming: free git_istream upon closing + +A large leak found and plugged. +Will merge to "master". + +* jn/gitweb-system-config (2011-07-24) 1 commit + - gitweb: Introduce common system-wide settings for convenience + +* js/ls-tree-error (2011-07-25) 2 commits + - Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails. + - Add a test to check that git ls-tree sets non-zero exit code on error. + +* jc/merge-reword (2011-05-25) 2 commits + - merge: mark the final "Merge made by..." message for l10n + - merge: reword the final message + +Probably the topmost commit should be dropped. + +* jk/reset-reflog-message-fix (2011-07-22) 1 commit + - reset: give better reflog messages + +Will merge to "next". + +* jk/add-i-hunk-filter (2011-07-27) 5 commits + - add--interactive: add option to autosplit hunks + - add--interactive: allow negatation of hunk filters + - add--interactive: allow hunk filtering on command line + - add--interactive: factor out regex error handling + - add--interactive: refactor patch mode argument processing + +* mh/check-attr-listing (2011-07-27) 19 commits + - Rename struct git_attr_check to git_attr_value + - git-check-attr: Fix command-line handling to match docs + - git-check-attr: Drive two tests using the same raw data + - git-check-attr: Add an --all option to show all attributes + - git-check-attr: Error out if no pathnames are specified + - git-check-attr: Process command-line args more systematically + - git-check-attr: Handle each error separately + - git-check-attr: Extract a function error_with_usage() + - git-check-attr: Introduce a new variable + - git-check-attr: Extract a function output_attr() + - Allow querying all attributes on a file + - git-check-attr: Use git_attr_name() + - Provide access to the name attribute of git_attr + - git-check-attr: Add tests of command-line parsing + - git-check-attr: Add missing "&&" + - Disallow the empty string as an attribute name + - Remove anachronism from comment + - doc: Correct git_attr() calls in example code + - doc: Add a link from gitattributes(5) to git-check-attr(1) + -------------------------------------------------- [Graduated to "master"] -* ak/gcc46-profile-feedback (2011-06-20) 3 commits - (merged to 'next' on 2011-07-01 at 81bc0a7) - + Add explanation of the profile feedback build to the README - + Add profile feedback build to git - + Add option to disable NORETURN - -* jc/index-pack (2011-06-05) 9 commits - (merged to 'next' on 2011-07-05 at 5062ba9) - + verify-pack: use index-pack --verify - + index-pack: show histogram when emulating "verify-pack -v" - + index-pack: start learning to emulate "verify-pack -v" - + index-pack: a miniscule refactor - + index-pack --verify: read anomalous offsets from v2 idx file - + write_idx_file: need_large_offset() helper function - + index-pack: --verify - + write_idx_file: introduce a struct to hold idx customization options - + index-pack: group the delta-base array entries also by type - -* jc/submodule-sync-no-auto-vivify (2011-06-26) 2 commits - (merged to 'next' on 2011-07-05 at b207ba3) - + submodule add: always initialize .git/config entry - + submodule sync: do not auto-vivify uninteresting submodule - -* jc/zlib-wrap (2011-06-10) 7 commits - (merged to 'next' on 2011-07-05 at 77bcbdc) - + zlib: allow feeding more than 4GB in one go - + zlib: zlib can only process 4GB at a time - + zlib: wrap deflateBound() too - + zlib: wrap deflate side of the API - + zlib: wrap inflateInit2 used to accept only for gzip format - + zlib: wrap remaining calls to direct inflate/inflateEnd - + zlib wrapper: refactor error message formatter - -We used to use zlib incorrectly and botched inflating/deflating data -that is more than 4GB long on platforms with 64-bit ulong. - -* jk/archive-tar-filter (2011-06-22) 9 commits - (merged to 'next' on 2011-07-05 at add3e7f) - + upload-archive: allow user to turn off filters - + archive: provide builtin .tar.gz filter - + archive: implement configurable tar filters - + archive: refactor file extension format-guessing - + archive: move file extension format-guessing lower - + archive: pass archiver struct to write_archive callback - + archive: refactor list of archive formats - + archive-tar: don't reload default config options - + archive: reorder option parsing and config reading - -* jk/clone-cmdline-config (2011-06-22) 4 commits - (merged to 'next' on 2011-07-05 at a022613) - + clone: accept config options on the command line - + config: make git_config_parse_parameter a public function - + remote: use new OPT_STRING_LIST - + parse-options: add OPT_STRING_LIST helper - (this branch uses jk/maint-config-param.) - -* jk/maint-config-param (2011-06-22) 6 commits - (merged to 'next' on 2011-07-05 at 2dce181) - + config: use strbuf_split_str instead of a temporary strbuf - + strbuf: allow strbuf_split to work on non-strbufs - + config: avoid segfault when parsing command-line config - + config: die on error in command-line config - + fix "git -c" parsing of values with equals signs - + strbuf_split: add a max parameter - (this branch is used by jk/clone-cmdline-config.) - -* jk/tag-list-multiple-patterns (2011-06-20) 1 commit - (merged to 'next' on 2011-07-05 at 8db1bf0) - + tag: accept multiple patterns for --list - -* jn/gitweb-split-header-html (2011-06-22) 1 commit - (merged to 'next' on 2011-07-05 at c60d9dc) - + gitweb: Refactor git_header_html - -* jn/mime-type-with-params (2011-06-30) 2 commits - (merged to 'next' on 2011-07-05 at 7caaf3b) - + gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss - + gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss +* bw/log-all-ref-updates-doc (2011-07-12) 1 commit + (merged to 'next' on 2011-07-14 at 31b80a8) + + Documentation: clearly specify what refs are honored by core.logAllRefUpdates + +* dc/stash-con-untracked (2011-06-26) 1 commit + (merged to 'next' on 2011-07-13 at 9ed0d1d) + + stash: Add --include-untracked option to stash and remove all untracked files + +* dz/connect-error-report (2011-07-14) 1 commit + (merged to 'next' on 2011-07-14 at bf1c775) + + Do not log unless all connect() attempts fail + +* jc/checkout-reflog-fix (2011-07-06) 3 commits + (merged to 'next' on 2011-07-14 at 5982cdd) + + Merge commit 'v1.7.6' into jc/checkout-reflog-fix + + Merge commit 'v1.7.0' into jc/checkout-reflog-fix + + Merge commit 'v1.6.0' into jc/checkout-reflog-fix + (this branch uses jc/maint-checkout-reflog-fix.) + +* jc/maint-checkout-reflog-fix (2011-07-06) 1 commit + + checkout: do not write bogus reflog entry out + (this branch is used by jc/checkout-reflog-fix.) + +* jc/maint-mergetool-read-fix (2011-07-01) 1 commit + (merged to 'next' on 2011-07-14 at 2056a67) + + mergetool: check return value from read + +* jk/tag-contains-ab (2011-07-14) 5 commits + (merged to 'next' on 2011-07-14 at 002a9d7) + + Revert clock-skew based attempt to optimize tag --contains traversal + + git skew: a tool to find how big a clock skew exists in the history + (merged to 'next' on 2011-07-05 at f9cf575) + + default core.clockskew variable to one day + + limit "contains" traversals based on commit timestamp + + tag: speed up --contains calculation + (this branch is tangled with jk/generation-numbers.) + +Reverted the commits near the tip. + +* jl/submodule-add-relurl-wo-upstream (2011-06-06) 3 commits + (merged to 'next' on 2011-07-13 at f989abb) + + submodule add: clean up duplicated code + + submodule add: allow relative repository path even when no url is set + + submodule add: test failure when url is not configured in superproject + +* jn/gitweb-search (2011-06-22) 4 commits + (merged to 'next' on 2011-07-13 at 455acdd) + + gitweb: Make git_search_* subroutines render whole pages + + gitweb: Clean up code in git_search_* subroutines + + gitweb: Split body of git_search into subroutines + + gitweb: Check permissions first in git_search + +* js/maint-add-path-stat-pwd (2011-07-11) 1 commit + (merged to 'next' on 2011-07-14 at c6fef9d) + + get_pwd_cwd(): Do not trust st_dev/st_ino blindly + +* ms/help-unknown (2011-07-08) 1 commit + (merged to 'next' on 2011-07-14 at d7976b4) + + help_unknown_cmd: do not propose an "unknown" cmd + +* mz/doc-rebase-abort (2011-07-13) 1 commit + (merged to 'next' on 2011-07-14 at a1a612c) + + rebase: clarify "restore the original branch" + +* mz/doc-synopsis-verse (2011-07-06) 1 commit + (merged to 'next' on 2011-07-14 at 34d45e2) + + Documentation: use [verse] for SYNOPSIS sections -------------------------------------------------- -[New Topics] +[Stalled] + +* nk/branch-v-abbrev (2011-07-01) 1 commit + - branch -v: honor core.abbrev + +Perhaps needs an updated commit log message? + +* di/fast-import-doc (2011-07-13) 2 commits + - doc/fast-import: document feature import-marks-if-exists + - doc/fast-import: clarify notemodify command + +Comments from fast-import folks? + +* jh/receive-count-limit (2011-05-23) 10 commits + - receive-pack: Allow server to refuse pushes with too many objects + - pack-objects: Estimate pack size; abort early if pack size limit is exceeded + - send-pack/receive-pack: Allow server to refuse pushing too large packs + - pack-objects: Allow --max-pack-size to be used together with --stdout + - send-pack/receive-pack: Allow server to refuse pushes with too many commits + - pack-objects: Teach new option --max-commit-count, limiting #commits in pack + - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities + - Tighten rules for matching server capabilities in server_supports() + - send-pack: Attempt to retrieve remote status even if pack-objects fails + - Update technical docs to reflect side-band-64k capability in receive-pack + +Would need another round to separate per-pack and per-session limits. + +* jm/mergetool-pathspec (2011-06-22) 2 commits + - mergetool: Don't assume paths are unmerged + - mergetool: Add tests for filename with whitespace + +I think this is a good idea, but it probably needs a re-roll. +Cf. $gmane/176254, 176255, 166256 + +* jk/generation-numbers (2011-07-14) 7 commits + - limit "contains" traversals based on commit generation + - check commit generation cache validity against grafts + - pretty: support %G to show the generation number of a commit + - commit: add commit_generation function + - add metadata-cache infrastructure + - decorate: allow storing values instead of pointers + - Merge branch 'jk/tag-contains-ab' (early part) into HEAD + +The initial "tag --contains" de-pessimization without need for generation +numbers is already in; backburnered. + +-------------------------------------------------- +[Cooking] * jc/maint-reset-unmerged-path (2011-07-13) 1 commit (merged to 'next' on 2011-07-19 at bbc2d54) + reset [] paths...: do not mishandle unmerged paths (this branch is used by jc/diff-index-refactor.) +Will merge to "master". + * jc/diff-index-refactor (2011-07-13) 2 commits - diff-lib: refactor run_diff_index() and do_diff_cache() - diff-lib: simplify do_diff_cache() @@ -110,9 +204,10 @@ that is more than 4GB long on platforms with 64-bit ulong. (this branch uses sr/transport-helper-fix.) * vi/make-test-vector-less-specific (2011-07-19) 1 commit - - tests: cleanup binary test vector files + (merged to 'next' on 2011-07-25 at 1973192) + + tests: cleanup binary test vector files -* jk/http-auth-keyring (2011-07-20) 13 commits +* jk/http-auth-keyring (2011-07-21) 14 commits - credentials: add "getpass" helper - credentials: add "store" helper - credentials: add "cache" helper @@ -121,41 +216,20 @@ that is more than 4GB long on platforms with 64-bit ulong. - allow the user to configure credential helpers - look for credentials in config before prompting - http: use credential API to get passwords + - fixup! introduce credentials API - introduce credentials API - http: retry authentication failures for all http requests - remote-curl: don't retry auth failures with dumb protocol - improve httpd auth tests - url: decode buffers that are not NUL-terminated -* tc/minix (2011-07-20) 1 commit - - Makefile: add Minix configuration options. +Looked mostly reasonable except for the limitation that it is not clear +how to deal with a site at which a user needs to use different passwords +for different repositories. --------------------------------------------------- -[Stalled] - -* jh/receive-count-limit (2011-05-23) 10 commits - - receive-pack: Allow server to refuse pushes with too many objects - - pack-objects: Estimate pack size; abort early if pack size limit is exceeded - - send-pack/receive-pack: Allow server to refuse pushing too large packs - - pack-objects: Allow --max-pack-size to be used together with --stdout - - send-pack/receive-pack: Allow server to refuse pushes with too many commits - - pack-objects: Teach new option --max-commit-count, limiting #commits in pack - - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities - - Tighten rules for matching server capabilities in server_supports() - - send-pack: Attempt to retrieve remote status even if pack-objects fails - - Update technical docs to reflect side-band-64k capability in receive-pack - -Would need another round to separate per-pack and per-session limits. - -* jm/mergetool-pathspec (2011-06-22) 2 commits - - mergetool: Don't assume paths are unmerged - - mergetool: Add tests for filename with whitespace - -I think this is a good idea, but it probably needs a re-roll. -Cf. $gmane/176254, 176255, 166256 - --------------------------------------------------- -[Cooking] +* tc/minix (2011-07-20) 1 commit + (merged to 'next' on 2011-07-25 at 36ad29f) + + Makefile: add Minix configuration options. * sr/transport-helper-fix (2011-07-19) 21 commits (merged to 'next' on 2011-07-19 at e1ef414) @@ -182,89 +256,41 @@ Cf. $gmane/176254, 176255, 166256 + transport-helper: fix minor leak in push_refs_with_export (this branch is used by sr/transport-helper-fix-rfc.) -* bw/log-all-ref-updates-doc (2011-07-12) 1 commit - (merged to 'next' on 2011-07-14 at 31b80a8) - + Documentation: clearly specify what refs are honored by core.logAllRefUpdates +Will merge to "master". -* di/fast-import-doc (2011-07-13) 2 commits - - doc/fast-import: document feature import-marks-if-exists - - doc/fast-import: clarify notemodify command +* jk/clone-detached (2011-06-07) 4 commits + (merged to 'next' on 2011-07-25 at 013d7d0) + + clone: always fetch remote HEAD + + make copy_ref globally available + + consider only branches in guess_remote_head + + t: add tests for cloning remotes with detached HEAD -Comments from fast-import folks? - -* dz/connect-error-report (2011-07-14) 1 commit - (merged to 'next' on 2011-07-14 at bf1c775) - + Do not log unless all connect() attempts fail +Will merge to "master". * jc/pack-order-tweak (2011-07-08) 2 commits - - pack-objects: optimize "recency order" - - core: log offset pack data accesses happened - -* jk/generation-numbers (2011-07-14) 8 commits - - limit "contains" traversals based on commit generation - - check commit generation cache validity against grafts - - pretty: support %G to show the generation number of a commit - - commit: add commit_generation function - - add metadata-cache infrastructure - - decorate: allow storing values instead of pointers - - Merge branch 'jk/tag-contains-ab' (early part) into HEAD - + tag: speed up --contains calculation - (this branch is tangled with jk/tag-contains-ab.) - -* js/maint-add-path-stat-pwd (2011-07-11) 1 commit - (merged to 'next' on 2011-07-14 at c6fef9d) - + get_pwd_cwd(): Do not trust st_dev/st_ino blindly - -* ms/help-unknown (2011-07-08) 1 commit - (merged to 'next' on 2011-07-14 at d7976b4) - + help_unknown_cmd: do not propose an "unknown" cmd - -* mz/doc-rebase-abort (2011-07-13) 1 commit - (merged to 'next' on 2011-07-14 at a1a612c) - + rebase: clarify "restore the original branch" - -* jc/maint-mergetool-read-fix (2011-07-01) 1 commit - (merged to 'next' on 2011-07-14 at 2056a67) - + mergetool: check return value from read - -* nk/branch-v-abbrev (2011-07-01) 1 commit - - branch -v: honor core.abbrev - -Perhaps needs an updated commit log message? - -* jc/checkout-reflog-fix (2011-07-06) 3 commits - (merged to 'next' on 2011-07-14 at 5982cdd) - + Merge commit 'v1.7.6' into jc/checkout-reflog-fix - + Merge commit 'v1.7.0' into jc/checkout-reflog-fix - + Merge commit 'v1.6.0' into jc/checkout-reflog-fix - (this branch uses jc/maint-checkout-reflog-fix.) - -* jc/maint-checkout-reflog-fix (2011-07-06) 1 commit - + checkout: do not write bogus reflog entry out - (this branch is used by jc/checkout-reflog-fix.) - -* js/ref-namespaces (2011-07-14) 6 commits - - t5509: (fixup) partial readability fix - - ref namespaces: tests - - ref namespaces: documentation - - ref namespaces: Support remote repositories via upload-pack and receive-pack - - ref namespaces: infrastructure - - Fix prefix handling in ref iteration functions - -* mz/doc-synopsis-verse (2011-07-06) 1 commit - (merged to 'next' on 2011-07-14 at 34d45e2) - + Documentation: use [verse] for SYNOPSIS sections + (merged to 'next' on 2011-07-25 at 1460c31) + + pack-objects: optimize "recency order" + + core: log offset pack data accesses happened + +* js/ref-namespaces (2011-07-21) 5 commits + (merged to 'next' on 2011-07-25 at 5b7dcfe) + + ref namespaces: tests + + ref namespaces: documentation + + ref namespaces: Support remote repositories via upload-pack and receive-pack + + ref namespaces: infrastructure + + Fix prefix handling in ref iteration functions * rc/histogram-diff (2011-07-12) 7 commits - - xdiff/xprepare: use a smaller sample size for histogram diff - - xdiff/xprepare: skip classification - - teach --histogram to diff - - t4033-diff-patience: factor out tests - - xdiff/xpatience: factor out fall-back-diff function - - xdiff/xprepare: refactor abort cleanups - - xdiff/xprepare: use memset() - -* rr/revert-cherry-pick-continue (2011-07-19) 18 commits + (merged to 'next' on 2011-07-25 at 3351028) + + xdiff/xprepare: use a smaller sample size for histogram diff + + xdiff/xprepare: skip classification + + teach --histogram to diff + + t4033-diff-patience: factor out tests + + xdiff/xpatience: factor out fall-back-diff function + + xdiff/xprepare: refactor abort cleanups + + xdiff/xprepare: use memset() + +* rr/revert-cherry-pick-continue (2011-07-27) 18 commits - revert: Introduce --continue to continue the operation - revert: Don't implictly stomp pending sequencer operation - revert: Remove sequencer state when no commits are pending @@ -284,19 +310,6 @@ Perhaps needs an updated commit log message? - config: Introduce functions to write non-standard file - advice: Introduce error_resolve_conflict -Getting very close, I would think... - -* dc/stash-con-untracked (2011-06-26) 1 commit - (merged to 'next' on 2011-07-13 at 9ed0d1d) - + stash: Add --include-untracked option to stash and remove all untracked files - -* jn/gitweb-search (2011-06-22) 4 commits - (merged to 'next' on 2011-07-13 at 455acdd) - + gitweb: Make git_search_* subroutines render whole pages - + gitweb: Clean up code in git_search_* subroutines - + gitweb: Split body of git_search into subroutines - + gitweb: Check permissions first in git_search - * en/merge-recursive (2011-07-14) 50 commits - fixup! Do not assume that qsort is stable - t3030: fix accidental success in symlink rename @@ -349,31 +362,4 @@ Getting very close, I would think... - t6042: Add failing testcase for rename/modify/add-source conflict - t6042: Add a testcase where git deletes an untracked file -Looked at up to 29/48; looks basically sound. - -* jk/tag-contains-ab (2011-07-14) 5 commits - (merged to 'next' on 2011-07-14 at 002a9d7) - + Revert clock-skew based attempt to optimize tag --contains traversal - + git skew: a tool to find how big a clock skew exists in the history - (merged to 'next' on 2011-07-05 at f9cf575) - + default core.clockskew variable to one day - + limit "contains" traversals based on commit timestamp - + tag: speed up --contains calculation - (this branch is tangled with jk/generation-numbers.) - -Reverted the commits near the tip. - -* jk/clone-detached (2011-06-07) 4 commits - - clone: always fetch remote HEAD - - make copy_ref globally available - - consider only branches in guess_remote_head - - t: add tests for cloning remotes with detached HEAD - -Somewhat involved bugfix. Seems to expose breakage in t5800 without the -stalled "transport-helper-fix" series. - -* jl/submodule-add-relurl-wo-upstream (2011-06-06) 3 commits - (merged to 'next' on 2011-07-13 at f989abb) - + submodule add: clean up duplicated code - + submodule add: allow relative repository path even when no url is set - + submodule add: test failure when url is not configured in superproject +Looked at up to 38/48; looks basically sound. -- 2.47.3