From: Junio C Hamano Date: Sat, 27 Apr 2013 00:32:37 +0000 (-0700) Subject: What's cooking (2013/04 #09) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d3df51339c59f46e8e9c4c903122a48d3748f9b;p=thirdparty%2Fgit.git What's cooking (2013/04 #09) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index c747c96213..77705d13fa 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,19 +1,29 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Apr 2013, #08; Tue, 23) -X-master-at: 562af5b0b900539bd7ef481316834e500f571899 -X-next-at: d6019519f9f40af1f430c4a5e6d87e69d376483d +Subject: What's cooking in git.git (Apr 2013, #09; Fri, 26) +X-master-at: b75cdfaa882a00f2274e74b21c1a9927d184ed29 +X-next-at: b1478c83563fcc2b22771ab08fa759a3972c365d -What's cooking in git.git (Apr 2013, #08; Tue, 23) +What's cooking in git.git (Apr 2013, #09; Fri, 26) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. -Both of the two topics on preparing "git add" users for the -behaviour change in Git 2.0 are in 'master'. We may want to tweak -the wording of warning messages and such before the feature freeze. +The release candidate preview 1.8.3-rc0 has been tagged. I'd like to +see people focus on catching and fixing last minute regressions and +incompleteness in the topics that have already in 'master' for the +upcoming release. New topics that are not relevant for the goal to +release a regression-free and complete 1.8.3 may not be queued even +on 'pu' until final to reduce hassles on integration testing (I do +not mean that it is forbidden to work on and discussing new topics +on the list. It is just the patches won't be considered as formal +submission and they won't hit 'pu'). + +As to the topics still cooking on 'next', I unfortunately do not see +anything that I feel comfortable merging for 1.8.3; but I am open to +suggestions. You can find the changes described here in the integration branches of the repositories listed at @@ -23,126 +33,110 @@ of the repositories listed at -------------------------------------------------- [Graduated to "master"] -* fc/untracked-zsh-prompt (2013-04-21) 1 commit - (merged to 'next' on 2013-04-22 at 472da3e) - + prompt: fix untracked files for zsh - - Zsh completion forgot that '%' character used to signal untracked - files needs to be escaped with another '%'. - - -* jk/receive-pack-deadlocks-with-early-failure (2013-04-19) 1 commit - (merged to 'next' on 2013-04-22 at 1e27177) - + receive-pack: close sideband fd on early pack errors - - When receive-pack detects error in the pack header it received in - order to decide which of unpack-objects or index-pack to run, it - returned without closing the error stream, which led to a hang - sideband thread. - - -* jn/gitweb-install-doc (2013-04-17) 2 commits - (merged to 'next' on 2013-04-22 at a5d4812) - + gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility - + gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM - - Reword gitweb configuration instrutions. - - -* kb/status-ignored-optim-2 (2013-04-15) 14 commits - (merged to 'next' on 2013-04-21 at d2a5c70) - + dir.c: git-status --ignored: don't scan the work tree twice - + dir.c: git-status --ignored: don't scan the work tree three times - + dir.c: git-status: avoid is_excluded checks for tracked files - + dir.c: replace is_path_excluded with now equivalent is_excluded API - + dir.c: unify is_excluded and is_path_excluded APIs - + dir.c: move prep_exclude - + dir.c: factor out parts of last_exclude_matching for later reuse - + dir.c: git-clean -d -X: don't delete tracked directories - + dir.c: make 'git-status --ignored' work within leading directories - + dir.c: git-status --ignored: don't list empty directories as ignored - + dir.c: git-ls-files --directories: don't hide empty directories - + dir.c: git-status --ignored: don't list empty ignored directories - + dir.c: git-status --ignored: don't list files in ignored directories - + dir.c: git-status --ignored: don't drop ignored directories - - A handful of issues in the code to traverse working tree to find - untracked and/or ignored files have been fixed, and the general - codepath involved in "status -u" and "clean" have been cleaned up - and optimized. - - -* nd/pretty-formats (2013-04-18) 13 commits - (merged to 'next' on 2013-04-22 at 3d63014) - + pretty: support %>> that steal trailing spaces - + pretty: support truncating in %>, %< and %>< - + pretty: support padding placeholders, %< %> and %>< - + pretty: add %C(auto) for auto-coloring - + pretty: split color parsing into a separate function - + pretty: two phase conversion for non utf-8 commits - + utf8.c: add reencode_string_len() that can handle NULs in string - + utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences - + utf8.c: move display_mode_esc_sequence_len() for use by other functions - + pretty: share code between format_decoration and show_decorations - + pretty-formats.txt: wrap long lines - + pretty: get the correct encoding for --pretty:format=%e - + pretty: save commit encoding from logmsg_reencode if the caller needs it - - pretty-printing body of the commit that is stored in non UTF-8 - encoding did not work well. The early part of this series fixes - it. And then it adds %C(auto) specifier that turns the coloring on - when we are emitting to the terminal, and adds column-aligning - format directives. - --------------------------------------------------- -[New Topics] - -* jc/add-2.0-ignore-removal (2013-04-22) 1 commit - - git add ... defaults to "-A" - (this branch uses jc/add-ignore-removal.) - - Updated endgame for "git add " that defaults to "--all" - aka "--no-ignore-removal". +* fc/remote-hg (2013-04-22) 16 commits + (merged to 'next' on 2013-04-25 at 152cb06) + + remote-hg: strip extra newline + + remote-hg: use marks instead of inlined files + + remote-hg: small performance improvement + + remote-hg: allow refs with spaces + + remote-hg: don't update bookmarks unnecessarily + + remote-hg: add support for schemes extension + + remote-hg: improve email sanitation + + remote-hg: add custom local tag write code + + remote-hg: write tags in the appropriate branch + + remote-hg: custom method to write tags + + remote-hg: add support for tag objects + + remote-hg: add branch_tip() helper + + remote-hg: properly mark branches up-to-date + + remote-hg: use python urlparse + + remote-hg: safer bookmark pushing + + remote-helpers: avoid has_key - Will cook in 'next' until Git 2.0. + Further updates to remote-hg (in contrib/). * jc/add-ignore-removal (2013-04-22) 2 commits - - git add: rephrase -A/--no-all warning - - git add: --ignore-removal is a better named --no-all + (merged to 'next' on 2013-04-24 at c85c5a7) + + git add: rephrase -A/--no-all warning + + git add: --ignore-removal is a better named --no-all (this branch is used by jc/add-2.0-ignore-removal.) Introduce "--ignore-removal" as a synonym to "--no-all" for "git add", and improve the 2.0 migration warning with it. - Will merge to 'next'. +* jk/remote-helper-with-signed-tags (2013-04-15) 3 commits + (merged to 'next' on 2013-04-21 at 0231d45) + + transport-helper: add 'signed-tags' capability + + transport-helper: pass --signed-tags=warn-strip to fast-export + + fast-export: add --signed-tags=warn-strip mode -* fc/remote-hg (2013-04-22) 16 commits - - remote-hg: strip extra newline - - remote-hg: use marks instead of inlined files - - remote-hg: small performance improvement - - remote-hg: allow refs with spaces - - remote-hg: don't update bookmarks unnecessarily - - remote-hg: add support for schemes extension - - remote-hg: improve email sanitation - - remote-hg: add custom local tag write code - - remote-hg: write tags in the appropriate branch - - remote-hg: custom method to write tags - - remote-hg: add support for tag objects - - remote-hg: add branch_tip() helper - - remote-hg: properly mark branches up-to-date - - remote-hg: use python urlparse - - remote-hg: safer bookmark pushing - - remote-helpers: avoid has_key + Allows remote-helpers to declare they can handle signed tags, and + issue a warning when using those that don't. - Further updates to remote-hg (in contrib/). - Will merge to 'next' after a few days. +* jn/glossary-revision (2013-04-21) 1 commit + (merged to 'next' on 2013-04-24 at 70efbe7) + + glossary: a revision is just a commit + + The wording for "revision" in the glossary wanted to say it refers + to "commit (noun) as a concept" but it was badly phrased. + + This may need further updates to hint that in contexts where it is + clear, the word may refer to an object name, not necessarily a + commit. But the patch as-is is already an improvement. + + +* ph/rebase-original (2013-04-23) 1 commit + (merged to 'next' on 2013-04-24 at c643dcd) + + rebase: find orig_head unambiguously + + +* rr/shortlog-doc (2013-04-22) 8 commits + (merged to 'next' on 2013-04-25 at a95a3fc) + + builtin/shortlog.c: make usage string consistent with log + + builtin/log.c: make usage string consistent with doc + + git-shortlog.txt: make SYNOPSIS match log, update OPTIONS + + git-log.txt: rewrite note on why "--" may be required + + git-log.txt: generalize .. + + git-log.txt: order OPTIONS properly; move .. + + revisions.txt: clarify the .. and ... syntax + + git-shortlog.txt: remove (-h|--help) from OPTIONS + + Update documentation for "log" and "shortlog". * th/bisect-skipped-log (2013-04-23) 1 commit - - bisect: Log possibly bad, skipped commits at bisection end + (merged to 'next' on 2013-04-25 at 1de189b) + + bisect: Log possibly bad, skipped commits at bisection end + +-------------------------------------------------- +[New Topics] + +* kb/full-history-compute-treesame-carefully (2013-04-24) 2 commits + - t6012: update test for tweaked full-history traversal + - Make --full-history consider more merges + + +* tr/remote-tighten-commandline-parsing (2013-04-24) 3 commits + - remote: 'show' and 'prune' can take more than one remote + - remote: check for superfluous arguments in 'git remote add' + - remote: add a test for extra arguments, according to docs + + Will merge to 'next'. + + +* zk/prompt-rebase-step (2013-04-25) 1 commit + (merged to 'next' on 2013-04-25 at a8264bf) + + bash-prompt.sh: show where rebase is at when stopped + + +* rr/pp-user-info-without-extra-allocation (2013-04-25) 3 commits + - pretty: remove intermediate strbufs from pp_user_info() + - pretty: simplify output line length calculation in pp_user_info() + - pretty: simplify input line length calculation in pp_user_info() + + Will merge to 'next'. -------------------------------------------------- [Stalled] @@ -175,6 +169,7 @@ of the repositories listed at - commit-slab: introduce a macro to define a slab for new type - commit-slab: avoid large realloc - commit: allow associating auxiliary info on-demand + (this branch is used by jc/show-branch.) Technology demonstration to show a way we could use unbound number of flag bits on commit objects. @@ -220,51 +215,24 @@ of the repositories listed at - show: honor --textconv for blobs - t4030: demonstrate behavior of show with textconv - Rerolld. I am not sure if I like "show " and "grep" that use + Rerolled. I am not sure if I like "show " and "grep" that use textconv by default, though. -* jn/glossary-revision (2013-04-21) 1 commit - - glossary: a revision is just a commit - - The wording for "revision" in the glossary wanted to say it refers - to "commit (noun) as a concept" but it was badly phrased. - - Will cook in 'next'. - - This may need further updates to hint that in contexts where it is - clear, the word may refer to an object name, not necessarily a - commit. - - -* rr/shortlog-doc (2013-04-22) 8 commits - - builtin/shortlog.c: make usage string consistent with log - - builtin/log.c: make usage string consistent with doc - - git-shortlog.txt: make SYNOPSIS match log, update OPTIONS - - git-log.txt: rewrite note on why "--" may be required - - git-log.txt: generalize .. - - git-log.txt: order OPTIONS properly; move .. - - revisions.txt: clarify the .. and ... syntax - - git-shortlog.txt: remove (-h|--help) from OPTIONS - - Update documentation for "log" and "shortlog". - - Looked reasonable. - Will merge to 'next'. - - * mh/multimail (2013-04-21) 1 commit - git-multimail: a replacement for post-receive-email Waiting for comments. -* jc/prune-all (2013-04-18) 3 commits +* jc/prune-all (2013-04-25) 4 commits + (merged to 'next' on 2013-04-26 at 97a7387) + + prune: introduce OPT_EXPIRY_DATE() and use it (merged to 'next' on 2013-04-22 at b00ccf6) + api-parse-options.txt: document "no-" for non-boolean options + git-gc.txt, git-reflog.txt: document new expiry options + date.c: add parse_expiry_date() - (this branch is used by mh/packed-refs-various.) + (this branch is tangled with mh/packed-refs-various.) We used the approxidate() parser for "--expire=" options of various commands, but it is better to treat --expire=all and @@ -286,11 +254,13 @@ of the repositories listed at Enhance "check-ignore" (1.8.2 update) to work more like "check-attr" over bidi-pipes. - Will cook in 'next'. + Will wait for a follow-up. + $gmane/222235 + The test in the second from the tip needs to be updated. -* mh/packed-refs-various (2013-04-23) 33 commits +* mh/packed-refs-various (2013-04-24) 36 commits - refs: handle the main ref_cache specially - refs: change do_for_each_*() functions to take ref_cache arguments - pack_one_ref(): do some cheap tests before a more expensive one @@ -324,27 +294,19 @@ of the repositories listed at - refs: document do_for_each_ref() and do_one_ref() - refs: document the fields of struct ref_value - refs: document flags constants REF_* - (this branch uses jc/prune-all.) + (merged to 'next' on 2013-04-22 at b00ccf6) + + api-parse-options.txt: document "no-" for non-boolean options + + git-gc.txt, git-reflog.txt: document new expiry options + + date.c: add parse_expiry_date() + (this branch is tangled with jc/prune-all.) Updates reading and updating packed-refs file, correcting corner case bugs. - Waiting for comments. - - -* jk/remote-helper-with-signed-tags (2013-04-15) 3 commits - (merged to 'next' on 2013-04-21 at 0231d45) - + transport-helper: add 'signed-tags' capability - + transport-helper: pass --signed-tags=warn-strip to fast-export - + fast-export: add --signed-tags=warn-strip mode - Allows remote-helpers to declare they can handle signed tags, and - issue a warning when using those that don't. - - Will merge to 'master'. - - -* fc/transport-helper-error-reporting (2013-04-17) 9 commits +* fc/transport-helper-error-reporting (2013-04-25) 10 commits + (merged to 'next' on 2013-04-25 at 3358f1a) + + t5801: "VAR=VAL shell_func args" is forbidden (merged to 'next' on 2013-04-22 at 5ba6467) + transport-helper: update remote helper namespace + transport-helper: trivial code shuffle @@ -359,10 +321,15 @@ of the repositories listed at Update transport helper to report errors and maintain ref hierarchy used to keep track of remote helper state better. - Will merge to 'master'. + J6t reports that the update to t5801 breaks on Windows by the + remote-testgit that is written in bash, and Windows port of bash + does not have process substitution so remote-testgit is unusable + there. -* jk/submodule-subdirectory-ok (2013-04-18) 2 commits +* jk/submodule-subdirectory-ok (2013-04-24) 3 commits + (merged to 'next' on 2013-04-24 at 6306b29) + + submodule: fix quoting in relative_path() (merged to 'next' on 2013-04-22 at f211e25) + submodule: drop the top-level requirement + rev-parse: add --prefix option @@ -389,7 +356,7 @@ of the repositories listed at Will cook in 'next'. -* jn/add-2.0-u-A-sans-pathspec (2013-04-03) 1 commit +* jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit - git add: -u/-A now affects the entire working tree Will cook in 'next' until Git 2.0. @@ -479,10 +446,11 @@ of the repositories listed at Will cook in 'next' until Git 2.0. --------------------------------------------------- -[Discarded] -* jc/add-2.0-delete-default (2013-04-21) 1 commit +* jc/add-2.0-ignore-removal (2013-04-22) 1 commit - git add ... defaults to "-A" - Superseded by jc/add-2.0-ignore-removal + Updated endgame for "git add " that defaults to "--all" + aka "--no-ignore-removal". + + Will cook in 'next' until Git 2.0.