From 8ff912128ddf9ea9f34dfc36ad30744b62668503 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 15 May 2011 18:05:29 -0700 Subject: [PATCH] What's cooking (2011/05 #07) --- whats-cooking.txt | 225 +++++++++++++++++++++------------------------- 1 file changed, 101 insertions(+), 124 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 9ee39acf74..5c66cc0519 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,9 +1,9 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (May 2011, #06; Fri, 13) -X-master-at: 2de58b398b5a1f81bf74a385e41cfc2fcd9cb427 -X-next-at: fcbf71a2ac7af454bec14832c8dfba57e793dda7 +Subject: What's cooking in git.git (May 2011, #07; Sun, 15) +X-master-at: c565cb452c1e20babe4d0632c58e0f11a9af30c4 +X-next-at: 1a857915d643622bb71b1f0683f43acb1ddb48df -What's cooking in git.git (May 2011, #06; Fri, 13) +What's cooking in git.git (May 2011, #07; Sun, 15) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -18,96 +18,27 @@ feature freeze in early June. We are about to finish the week #3 of this cycle. --------------------------------------------------- -[Graduated to "master"] - -* bf/commit-template-no-cleanup (2011-05-11) 1 commit - (merged to 'next' on 2011-05-11 at 01fde0d) - + Do not strip empty lines / trailing spaces from a commit message template - -* cn/log-parse-opt (2011-04-14) 1 commit - (merged to 'next' on 2011-04-28 at 02f2eac) - + log: convert to parse-options - -* jc/fix-add-u-unmerged (2011-04-23) 1 commit - (merged to 'next' on 2011-04-28 at f7ed821) - + Fix "add -u" that sometimes fails to resolve unmerged paths - (this branch is used by jc/add-delete-default.) - -* jc/t1506-shell-param-expansion-gotcha (2011-05-09) 1 commit - (merged to 'next' on 2011-05-11 at 6c8619e) - + t1507: avoid "${parameter'word'}" inside double-quotes - -* jh/dirstat-lines (2011-04-29) 8 commits - (merged to 'next' on 2011-04-29 at a302674) - + Mark dirstat error messages for translation - + Improve error handling when parsing dirstat parameters - + New --dirstat=lines mode, doing dirstat analysis based on diffstat - + Allow specifying --dirstat cut-off percentage as a floating point number - + Add config variable for specifying default --dirstat behavior - + Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file - + Make --dirstat=0 output directories that contribute < 0.1% of changes - + Add several testcases for --dirstat and friends - -* jn/setup-revisions-glob-and-friends-passthru (2011-04-21) 2 commits - (merged to 'next' on 2011-04-28 at 6006cc4) - + revisions: allow --glob and friends in parse_options-enabled commands - + revisions: split out handle_revision_pseudo_opt function - -* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix (2011-05-05) 2 commits - + send-pack: unbreak push over stateless rpc - + send-pack: avoid deadlock when pack-object dies early - (this branch is used by js/maint-send-pack-stateless-rpc-deadlock-fix.) - -* js/maint-send-pack-stateless-rpc-deadlock-fix (2011-05-05) 2 commits - (merged to 'next' on 2011-05-05 at 3f4ffb9) - + Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix - (merged to 'next' on 2011-04-28 at db7e04a) - + Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix - (this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix.) - -* rr/rerere-libify-clear-gc (2011-05-08) 1 commit - (merged to 'next' on 2011-05-11 at b1d8c88) - + rerere: libify rerere_clear() and rerere_gc() - -This is pure code movement. Changing them to suit the need of other -callers can be built on it as separate patches. - -------------------------------------------------- [New Topics] -* jc/maint-1.6.6-pathspec-stdin-and-cmdline (2011-05-11) 1 commit - + setup_revisions(): take pathspec from command line and --stdin correctly - (this branch is used by jc/magic-pathspec, jc/maint-1.7.4-pathspec-stdin-and-cmdline and jc/maint-pathspec-stdin-and-cmdline.) - -* jc/maint-1.7.4-pathspec-stdin-and-cmdline (2011-05-11) 1 commit - - Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' - (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/magic-pathspec and jc/maint-pathspec-stdin-and-cmdline.) - -* jc/maint-pathspec-stdin-and-cmdline (2011-05-11) 2 commits - - Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline' - - Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' - (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/magic-pathspec and jc/maint-1.7.4-pathspec-stdin-and-cmdline.) - -These are to fix an ancient bug where feeding "git log --stdin path" with -an input that also has additional pathspec corrupted memory. +* jc/replacing (2011-05-15) 5 commits + - read_sha1_file(): allow selective bypassing of replacement mechanism + - inline lookup_replace_object() calls + - read_sha1_file(): get rid of read_sha1_file_repl() madness + - t6050: make sure we test not just commit replacement + - Declare lookup_replace_object() in cache.h, not in commit.h + (this branch is used by jc/streaming.) -* jl/read-tree-m-dry-run (2011-05-11) 1 commit - - Teach read-tree the -n|--dry-run option +Will merge to "next" by the middle of week #4. -Looked good. We _might_ want to make -n simply ignore -u, though. +* jh/receive-count-limit (2011-05-14) 1 commit + - receive-pack: Add receive.objectCountLimit to refuse push with too many objects -* jc/streaming (2011-05-12) 5 commits - - write_entry(): use streaming API for writing working tree files - - stream: a streaming interface to read from the object store - - sha1_object_info_extended(): expose a bit more information from object-info - - write_entry(): separate two helper functions out - - packed_object_info_detail(): do not return a string - (this branch uses jc/convert.) +* jl/submodule-conflicted-gitmodules (2011-05-14) 2 commits + - Submodules: Don't parse .gitmodules when it contains, merge conflicts + - test that git status works with merge conflict in, .gitmodules -The counterpart to jc/bigfile to cover the write-out codepath. This does -not yet have "read directly from pack or loose object without slurping the -whole thing in memory" yet, which is still work in progress. +Will merge to "next" by the middle of week #4. -------------------------------------------------- [Stalled] @@ -194,10 +125,49 @@ Needs to tighten the advice to only govern the generic How-to part. -------------------------------------------------- [Cooking] -* jc/bigfile (2011-05-12) 3 commits - - Bigfile: teach "git add" to send a large file straight to a pack - - index_fd(): split into two helper functions - - index_fd(): turn write_object and format_check arguments into one flag +* jc/maint-1.6.6-pathspec-stdin-and-cmdline (2011-05-11) 1 commit + + setup_revisions(): take pathspec from command line and --stdin correctly + (this branch is used by jc/magic-pathspec, jc/maint-1.7.4-pathspec-stdin-and-cmdline and jc/maint-pathspec-stdin-and-cmdline.) + +* jc/maint-1.7.4-pathspec-stdin-and-cmdline (2011-05-11) 1 commit + - Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' + (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/magic-pathspec and jc/maint-pathspec-stdin-and-cmdline.) + +* jc/maint-pathspec-stdin-and-cmdline (2011-05-11) 2 commits + (merged to 'next' on 2011-05-15 at b4e3a75) + + Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline' + + Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' + (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/magic-pathspec and jc/maint-1.7.4-pathspec-stdin-and-cmdline.) + +These are to fix an ancient bug where feeding "git log --stdin path" with +an input that also has additional pathspec corrupted memory. + +* jl/read-tree-m-dry-run (2011-05-11) 1 commit + - Teach read-tree the -n|--dry-run option + +Looked good. We _might_ want to make -n simply ignore -u, though. + +* jc/streaming (2011-05-15) 12 commits + - streaming: read loose objects incrementally + - sha1_file.c: expose helpers to read loose objects + - streaming: read non-delta incrementally from a pack + - streaming_write_entry(): support files with holes + - streaming_write_entry(): use streaming API in write_entry() + - streaming: a new API to read from the object store + - write_entry(): separate two helper functions out + - unpack_object_header(): make it public + - sha1_object_info_extended(): hint about objects in delta-base cache + - sha1_object_info_extended(): expose a bit more info + - packed_object_info_detail(): do not return a string + - Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming + (this branch uses jc/bigfile, jc/convert and jc/replacing.) + +* jc/bigfile (2011-05-13) 3 commits + (merged to 'next' on 2011-05-15 at 0ee7144) + + Bigfile: teach "git add" to send a large file straight to a pack + + index_fd(): split into two helper functions + + index_fd(): turn write_object and format_check arguments into one flag + (this branch is used by jc/streaming.) This covers the entry point for a big file to the system. Other parts that need to know about them are the exit point (i.e. write_entry()), packing @@ -208,32 +178,35 @@ either unpack-objects or index-pack, which still want to hold the full object in-core and need to be fixed). * jc/convert (2011-05-09) 4 commits - - convert: make it harder to screw up adding a conversion attribute - - convert: make it safer to add conversion attributes - - convert: give saner names to crlf/eol variables, types and functions - - convert: rename the "eol" global variable to "core_eol" + (merged to 'next' on 2011-05-15 at 9d35a6e) + + convert: make it harder to screw up adding a conversion attribute + + convert: make it safer to add conversion attributes + + convert: give saner names to crlf/eol variables, types and functions + + convert: rename the "eol" global variable to "core_eol" (this branch is used by jc/streaming.) -Just a clean-up. -Will merge to "next" by the end of week #3. +Will merge to "master" by the middle of week #4. * jk/blame-line-porcelain (2011-05-09) 3 commits - - blame: add --line-porcelain output format - - blame: refactor porcelain output - - add tests for various blame formats + (merged to 'next' on 2011-05-15 at 93232b3) + + blame: add --line-porcelain output format + + blame: refactor porcelain output + + add tests for various blame formats -* ms/tagname-does-not-begin-with-dash (2011-05-10) 1 commit - - tag: disallow '-' as tag name +Will merge to "master" by the end of week #4. -Will merge to "next" by the end of week #3. +* ms/tagname-does-not-begin-with-dash (2011-05-10) 1 commit + (merged to 'next' on 2011-05-15 at 7df0461) + + tag: disallow '-' as tag name -* fc/completion-zsh (2011-05-10) 1 commit - + git-completion: fix regression in zsh support - (this branch is used by sg/completion-updates.) +Will merge to "master" by the end of week #4. * nd/sparse-co-fix (2011-05-10) 2 commits - - sparse checkout: do not eagerly decide the fate for whole directory - - t1011: fix sparse-checkout initialization and add new file + (merged to 'next' on 2011-05-15 at 1a85791) + + sparse checkout: do not eagerly decide the fate for whole directory + + t1011: fix sparse-checkout initialization and add new file + +Will merge to "master" by the end of week #4. * kk/maint-prefix-in-config-mak (2011-05-09) 3 commits (merged to 'next' on 2011-05-09 at 267a3aa) @@ -258,7 +231,7 @@ Will merge to "master" by the end of week #4. Will merge to "master" by the end of week #4. -* ab/i18n-scripts (2011-05-08) 48 commits +* ab/i18n-scripts (2011-05-14) 48 commits - i18n: git-bisect bisect_next_check "You need to" message - i18n: git-bisect [Y/n] messages - i18n: git-bisect bisect_replay + $1 messages @@ -309,15 +282,15 @@ Will merge to "master" by the end of week #4. - i18n: git-am add git-sh-i18n (this branch uses ab/i18n-scripts-basic.) -* ab/i18n-scripts-basic (2011-05-08) 4 commits +* ab/i18n-scripts-basic (2011-05-14) 4 commits - Makefile: add xgettext target for *.sh files - git-sh-i18n.sh: add GIT_GETTEXT_POISON support - git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers - git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext() (this branch is used by ab/i18n-scripts.) -Will be re-rolled to work around systems whose environment variable names -are case insensitive. +Re-rolled to drop credits from the individual documentation pages +and update the documentation. * mg/merge-ff-config (2011-05-06) 3 commits (merged to 'next' on 2011-05-08 at 977b432) @@ -328,19 +301,22 @@ are case insensitive. Will merge to "master" by the end of week #4. * mk/grep-pcre (2011-05-09) 10 commits - - git-grep: do not die upon -F/-P when grep.extendedRegexp is set. - - git-grep: Bail out when -P is used with -F or -E - - grep: Add basic tests - - configure: Check for libpcre - - git-grep: Learn PCRE - - grep: Extract compile_regexp_failed() from compile_regexp() - - grep: Fix a typo in a comment + (merged to 'next' on 2011-05-15 at d110135) + + git-grep: do not die upon -F/-P when grep.extendedRegexp is set. + + git-grep: Bail out when -P is used with -F or -E + + grep: Add basic tests + + configure: Check for libpcre + + git-grep: Learn PCRE + + grep: Extract compile_regexp_failed() from compile_regexp() + + grep: Fix a typo in a comment (merged to 'next' on 2011-05-08 at 5d3bede) + grep: Put calls to fixmatch() and regmatch() into patmatch() + contrib/completion: --line-number to git grep + Documentation: Add --line-number to git-grep synopsis -Will merge to "next" by the end of week #3. +* fc/completion-zsh (2011-05-10) 1 commit + + git-completion: fix regression in zsh support + (this branch is used by sg/completion-updates.) * sg/completion-updates (2011-05-10) 4 commits (merged to 'next' on 2011-05-10 at eaf5398) @@ -357,14 +333,15 @@ workaround blessed by zsh folks instead. Will merge to "master" by the end of week #4. -* ld/p4-preserve-user-names (2011-05-10) 3 commits - - git-p4: warn if git authorship won't be retained +* ld/p4-preserve-user-names (2011-05-13) 3 commits + (merged to 'next' on 2011-05-15 at bdedb60) + + git-p4: warn if git authorship won't be retained (merged to 'next' on 2011-05-11 at bc14314) + git-p4: small improvements to user-preservation (merged to 'next' on 2011-04-29 at 25116c8) + git-p4: add option to preserve user names -The tip one will be re-rolled. +Will merge to "master" by the end of week #4. * jc/magic-pathspec (2011-05-12) 13 commits (merged to 'next' on 2011-05-12 at 656c8b5) @@ -386,4 +363,4 @@ The tip one will be re-rolled. + magic pathspec: add tentative ":/path/from/top/level" pathspec support (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/maint-1.7.4-pathspec-stdin-and-cmdline and jc/maint-pathspec-stdin-and-cmdline.) -This seems to need more time to mature than I expected. +Will merge to "master" by the end of week #4. -- 2.47.3