From: Junio C Hamano Date: Tue, 10 Jan 2012 00:44:35 +0000 (-0800) Subject: What's cooking (2012/01 #02) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d9c22f7ddd04671116c609e051221a373057c54;p=thirdparty%2Fgit.git What's cooking (2012/01 #02) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 23f4388992..ac8284c725 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,18 +1,15 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Jan 2012, #01; Thu, 5) -X-master-at: 247f9d23da8cfd255533433ad2aa07d172afac0b -X-next-at: 5da3ae2f29b4c8b897e934b1856cbb7753383aee +Subject: What's cooking in git.git (Jan 2012, #02; Mon, 9) +X-master-at: beecc7ab65b31c5471331e64acaa3f722125ea67 +X-next-at: 6c3c759d2442c2dca37be91f899570e1396d5bd5 -What's cooking in git.git (Jan 2012, #01; Thu, 5) +What's cooking in git.git (Jan 2012, #02; Mon, 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'. -I'll be tagging 1.7.9-rc0 after merging a few topics to "master" to make -it feature complete for the upcoming release tomorrow. - Here are the repositories that have my integration branches: With maint, master, next, pu, todo: @@ -41,39 +38,43 @@ The preformatted documentation in HTML and man format are found in: -------------------------------------------------- [New Topics] -* ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits - - fixup! 15eaaf4 - - git-svn, perl/Git.pm: extend Git::prompt helper for querying users - (merged to 'next' on 2012-01-05 at 954f125) - + perl/Git.pm: "prompt" helper to honor GIT_ASKPASS and SSH_ASKPASS +* rs/diff-postimage-in-context (2012-01-06) 1 commit + (merged to 'next' on 2012-01-09 at 9635032) + + xdiff: print post-image for common records instead of pre-image -The bottom one has been replaced with a rewrite based on comments from -Ævar. The second one needs more work, both in perl/Git.pm and prompt.c, to -give precedence to tty over SSH_ASKPASS when terminal is available. +Looked reasonable. +Not urgent. -I think it is OK to include the first one in the upcoming release, but we -may want to wait and defer both to the next cycle. +* cb/push-quiet (2012-01-08) 3 commits + - t5541: avoid TAP test miscounting + - fix push --quiet: add 'quiet' capability to receive-pack + - server_supports(): parse feature list more carefully -* pw/p4-view-updates (2012-01-03) 6 commits - (merged to 'next' on 2012-01-03 at c3b5872) - + git-p4: view spec documentation - + git-p4: rewrite view handling - + git-p4: support single file p4 client view maps - + git-p4: sort client views by reverse View number - + git-p4: fix test for unsupported P4 Client Views - + git-p4: test client view handling +Looked reasonable. +Not urgent. + +* nd/clone-detached (2012-01-08) 6 commits + - clone: print advice on checking out detached HEAD + - clone: allow --branch to take a tag + - clone: --branch= always means refs/heads/ + - clone: factor out checkout code + - clone: write detached HEAD in bare repositories + - t5601: add missing && cascade -Will merge to 'master' by 1.7.9 final. -Unless real git-p4 users object (I am not one of them, so I cannot really -judge), that is. +I am not sure what the benefit of this is. -* cb/git-daemon-tests (2012-01-04) 1 commit - (merged to 'next' on 2012-01-05 at 86f3e93) - + daemon: add tests +* nd/clone-single-branch (2012-01-08) 1 commit + (merged to 'next' on 2012-01-09 at 6c3c759) + + clone: add --single-branch to fetch only one branch -It stirred a related discussion on how the process termination should be -handled in the daemon, but the test queued should be OK as-is on systems -that have "pkill" (which is outside POSIX). +Looked reasonable. +Not urgent. + +* jn/gitweb-unspecified-action (2012-01-09) 1 commit + - gitweb: Fix actionless dispatch for non-existent objects + +-------------------------------------------------- +[Graduated to "master"] * jc/show-sig (2012-01-05) 6 commits (merged to 'next' on 2012-01-05 at 5da3ae2) @@ -87,83 +88,98 @@ that have "pkill" (which is outside POSIX). Finishing touches to the already graduated "pull signed tags" topic. -Will merge to 'master' by 1.7.9 final. +* jc/signed-commit (2011-11-29) 5 commits + (merged to 'next' on 2011-12-21 at 8fcbf00) + + gpg-interface: allow use of a custom GPG binary + + pretty: %G[?GS] placeholders + + test "commit -S" and "log --show-signature" + + log: --show-signature + + commit: teach --gpg-sign option + (this branch is used by jc/show-sig.) + +* jh/fetch-head-update (2012-01-03) 1 commit + (merged to 'next' on 2012-01-04 at b5778e1) + + write first for-merge ref to FETCH_HEAD first + +* jk/credentials (2012-01-08) 1 commit + (merged to 'next' on 2012-01-08 at 48766c9) + + credentials: unable to connect to cache daemon * jm/stash-diff-disambiguate (2012-01-01) 1 commit (merged to 'next' on 2012-01-05 at 75a283b) + stash: Don't fail if work dir contains file named 'HEAD' -Will merge to 'master' by 1.7.9 final. +* mh/ref-api-less-extra-refs (2012-01-06) 3 commits + (merged to 'next' on 2012-01-06 at 3105696) + + write_head_info(): handle "extra refs" locally + + show_ref(): remove unused "flag" and "cb_data" arguments + + receive-pack: move more work into write_head_info() * mm/maint-gitweb-project-maxdepth (2012-01-04) 1 commit - - gitweb: accept trailing "/" in $project_list + (merged to 'next' on 2012-01-06 at bcf3818) + + gitweb: accept trailing "/" in $project_list Looked quite sensible. -Will merge to 'master' by 1.7.9 final. -* nd/shallow-clone-without-tag-following (2012-01-05) 1 commit - - Limit refs to fetch to minimum in shallow clones +* pw/p4-view-updates (2012-01-03) 6 commits + (merged to 'next' on 2012-01-03 at c3b5872) + + git-p4: view spec documentation + + git-p4: rewrite view handling + + git-p4: support single file p4 client view maps + + git-p4: sort client views by reverse View number + + git-p4: fix test for unsupported P4 Client Views + + git-p4: test client view handling -Needs adjustment of t5500 at least, and possibly an option to ask for the -traditional "shallowly clone all branches" behaviour. +-------------------------------------------------- +[Stalled] -* jk/parse-object-cached (2012-01-05) 1 commit - - parse_object: try internal cache before reading object db +* jc/advise-push-default (2011-12-18) 1 commit + - push: hint to use push.default=upstream when appropriate -This is a bit scary change, but I do not think of a way it would break -anything that is currently working correctly. +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? -* jn/maint-gitweb-grep-fix (2012-01-05) 2 commits - - gitweb: Harden "grep" search against filenames with ':' - - gitweb: Fix file links in "grep" search +Waiting for a reroll. -Waiting for a confirmation from bug reporter. +* jc/split-blob (2011-12-01) 6 commits + . WIP (streaming chunked) + - chunked-object: fallback checkout codepaths + - bulk-checkin: support chunked-object encoding + - bulk-checkin: allow the same data to be multiply hashed + - new representation types in the packstream + - varint-in-pack: refactor varint encoding/decoding --------------------------------------------------- -[Graduated to "master"] +Not ready. -* jv/maint-config-set (2011-12-27) 1 commit - (merged to 'next' on 2011-12-27 at 551ac8f) - + Fix an incorrect reference to --set-all. - -* pw/p4-docs-and-tests (2011-12-27) 11 commits - (merged to 'next' on 2011-12-28 at 8acf26e) - + git-p4: document and test submit options - + git-p4: test and document --use-client-spec - + git-p4: test --keep-path - + git-p4: test --max-changes - + git-p4: document and test --import-local - + git-p4: honor --changesfile option and test - + git-p4: document and test clone --branch - + git-p4: test cloning with two dirs, clarify doc - + git-p4: clone does not use --git-dir - + git-p4: introduce asciidoc documentation - + rename git-p4 tests +At least pack-objects and fsck need to learn the new encoding for the +series to be usable locally, and then index-pack/unpack-objects needs to +learn it to be used remotely. --------------------------------------------------- -[Stalled] +* jc/advise-i18n (2011-12-22) 1 commit + - i18n of multi-line advice messages -* bw/maint-t8006-sed-incomplete-line (2012-01-03) 1 commit - - Work around sed portability issue in t8006-blame-textconv +Allow localization of advice messages that tend to be longer and +multi-line formatted. For now this is deliberately limited to advise() +interface and not vreportf() in general as touching the latter has +interactions with error() that has plumbing callers whose prefix "error: " +should never be translated. -Waiting for a clarification of the reasoning in the log message. +-------------------------------------------------- +[Cooking] -* nd/index-pack-no-recurse (2011-12-27) 4 commits - - fixup! 3413d4d +* nd/index-pack-no-recurse (2012-01-09) 3 commits - index-pack: eliminate unlimited recursion in get_delta_base() - index-pack: eliminate recursion in find_unresolved_deltas - Eliminate recursion in setting/clearing marks in commit list -Expecting a reroll. +The first one looked sensible; I am not sure if the second and third ones +take the right approach. -* jc/advise-push-default (2011-12-18) 1 commit - - 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? +* bw/maint-t8006-sed-incomplete-line (2012-01-03) 1 commit + - Work around sed portability issue in t8006-blame-textconv -Waiting for a reroll. +Waiting for a clarification of the reasoning in the log message. * mh/ref-api-rest (2011-12-12) 35 commits - repack_without_ref(): call clear_packed_ref_cache() @@ -203,65 +219,44 @@ Waiting for a reroll. - do_for_each_ref(): correctly terminate while processesing extra_refs The API for extra anchoring points may require rethought first; that would -hopefully make the "ref" part a lot simpler. +hopefully make the "ref" part a lot simpler. And that is happening in +another topic (which has graduated to 'master'). -Waiting for a reroll. +Will defer till the next cycle. -* jc/split-blob (2011-12-01) 6 commits - . WIP (streaming chunked) - - chunked-object: fallback checkout codepaths - - bulk-checkin: support chunked-object encoding - - bulk-checkin: allow the same data to be multiply hashed - - new representation types in the packstream - - varint-in-pack: refactor varint encoding/decoding - -Not ready. - -At least pack-objects and fsck need to learn the new encoding for the -series to be usable locally, and then index-pack/unpack-objects needs to -learn it to be used remotely. +* ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits + - fixup! 15eaaf4 + - git-svn, perl/Git.pm: extend Git::prompt helper for querying users + (merged to 'next' on 2012-01-05 at 954f125) + + perl/Git.pm: "prompt" helper to honor GIT_ASKPASS and SSH_ASKPASS -* jc/advise-i18n (2011-12-22) 1 commit - - i18n of multi-line advice messages +The bottom one has been replaced with a rewrite based on comments from +Ævar. The second one needs more work, both in perl/Git.pm and prompt.c, to +give precedence to tty over SSH_ASKPASS when terminal is available. -Allow localization of advice messages that tend to be longer and -multi-line formatted. For now this is deliberately limited to advise() -interface and not vreportf() in general as touching the latter has -interactions with error() that has plumbing callers whose prefix "error: " -should never be translated. +Will defer till the next cycle. --------------------------------------------------- -[Cooking] +* cb/git-daemon-tests (2012-01-08) 5 commits + (merged to 'next' on 2012-01-08 at 1db8351) + + git-daemon tests: wait until daemon is ready + + git-daemon: produce output when ready + + git-daemon: add tests + + dashed externals: kill children on exit + + run-command: optionally kill children on exit -* jh/fetch-head-update (2012-01-03) 1 commit - (merged to 'next' on 2012-01-04 at b5778e1) - + write first for-merge ref to FETCH_HEAD first +Will defer till the next cycle. -Will merge to 'master' by 1.7.9 final. +* jk/parse-object-cached (2012-01-06) 3 commits + (merged to 'next' on 2012-01-08 at 8c6fa4a) + + upload-pack: avoid parsing tag destinations + + upload-pack: avoid parsing objects during ref advertisement + + parse_object: try internal cache before reading object db -* jc/signed-commit (2011-11-29) 5 commits - (merged to 'next' on 2011-12-21 at 8fcbf00) - + gpg-interface: allow use of a custom GPG binary - + pretty: %G[?GS] placeholders - + test "commit -S" and "log --show-signature" - + log: --show-signature - + commit: teach --gpg-sign option - (this branch is used by jc/show-sig.) +These are a bit scary changes, but I do think they are worth doing. +Will defer till the next cycle. -The infrastructure this series adds is used by the finishing touches to -the earlier "pull signed tags" topic, so this will graduate to "master" -together with it when the latter matures, hopefully before 1.7.9 final. +* jn/maint-gitweb-grep-fix (2012-01-05) 2 commits + - gitweb: Harden "grep" search against filenames with ':' + - gitweb: Fix file links in "grep" search --------------------------------------------------- -[Discarded] - -* ss/git-svn-askpass (2011-12-27) 5 commits - - make askpass_prompt a global prompt method for asking users - - ignore empty *_ASKPASS variables - - honour *_ASKPASS for querying username and for querying further actions like unknown certificates - - switch to central prompt method - - add central method for prompting a user using GIT_ASKPASS or SSH_ASKPASS - -This has become more about "prompt without terminal", and was rerolled -into a two-patch series, which is structured a lot nicer than this -original. +Waiting for a confirmation from bug reporter.