From 5fe51da2c7de1676598a7ff17152e8472148725c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 3 Aug 2011 17:30:15 -0700 Subject: [PATCH] What's cooking (2011/08 #01) --- whats-cooking.txt | 281 +++++++++++++++++++++++++++++----------------- 1 file changed, 176 insertions(+), 105 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 2fc8c0b82c..b195bc912d 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,28 +1,134 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Jul 2011, #05; Sun, 31) -X-master-at: b35acb53458d0f99ba2400b902980b35e5acc2d3 -X-next-at: ec3e38edaac75ed4160d114e62c74b1d1d55c320 +Subject: What's cooking in git.git (Aug 2011, #01; Wed, 3) +X-master-at: 6a319e393b856461bab89ffe332a02e71befee40 +X-next-at: b06e80e736fa17ec470db045b45ab3a5e6a5bd3a -What's cooking in git.git (Jul 2011, #05; Sun, 31) +What's cooking in git.git (Aug 2011, #01; Wed, 3) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' while commits prefixed with '+' are in 'next'. +There are a few 'fixup!' commits queued in topics still in 'pu', so that +authors have a choice to just say "that fix looks good, squash it in!" +instead of going through an extra round. + +I should start making noises about the feature freeze by now, but with a +vacation week in the US early in July, my half-absense during OSCON last +week, and just because it is summer in general, this round is going slower +than planned. Let's shoot for the feature freeze in two weeks and decide +which stragglers to postpone to the next round. + -------------------------------------------------- [New Topics] -* cb/maint-exec-error-report (2011-07-31) 1 commit - - error_routine: use parent's stderr if exec fails +* ac/describe-dirty-refresh (2011-08-01) 2 commits + - fixup! describe: Refresh the index when run with --dirty + - describe: Refresh the index when run with --dirty -* cb/maint-quiet-push (2011-07-31) 1 commit - - propagate --quiet to send-pack/receive-pack +* cb/maint-ls-files-error-report (2011-08-01) 2 commits + - squash! ls-files: fix pathspec display on error + - ls-files: fix pathspec display on error -* jl/submodule-update-quiet (2011-07-28) 1 commit - - submodule: update and add must honor --quiet flag +* ef/ipv4-connect-error-report (2011-08-01) 2 commits + (merged to 'next' on 2011-08-03 at ea4842b) + + connect: only log if all attempts failed (ipv4) + + Merge branch 'maint' into ef/ipv4-connect-error-report -* jn/gitweb-config-list-case (2011-07-31) 1 commit - - gitweb: Git config keys are case insensitive, make config search too +* jl/submodule-status-summary-doc (2011-08-01) 1 commit + (merged to 'next' on 2011-08-03 at 88f97a9) + + Documentation/submodule: add command references and update options + +* js/bisect-no-checkout (2011-08-03) 9 commits + - bisect: add documentation for --no-checkout option. + - fixup! bisect: add tests for the --no-checkout option + - bisect: add tests for the --no-checkout option. + - fixup! bisect: introduce --no-checkout support into porcelain + - bisect: introduce --no-checkout support into porcelain. + - bisect: introduce support for --no-checkout option. + - bisect: add tests to document expected behaviour in presence of broken trees. + - bisect: use && to connect statements that are deferred with eval. + - bisect: move argument parsing before state modification. + +Getting there; I have a couple of trivial fix-ups queued there, though. + +* ms/reflog-show-is-default (2011-08-01) 1 commit + (merged to 'next' on 2011-08-03 at ae9cf6f) + + reflog: actually default to subcommand 'show' + +* oa/pull-reflog (2011-08-01) 1 commit + (merged to 'next' on 2011-08-03 at faeff94) + + pull: remove extra space from reflog message + +* rs/grep-function-context (2011-08-01) 2 commits + - grep: long context options + - grep: add option to show whole function as context + +Will merge to "next". + +* cb/partial-commit-relative-pathspec (2011-08-02) 1 commit + (merged to 'next' on 2011-08-03 at 6918f69) + + commit: allow partial commits with relative paths + +* mh/check-attr-relative (2011-08-02) 7 commits + - fixup! builtin/check-attr.c and test-path-utils.c + - test-path-utils: Add subcommand "prefix_path" + - test-path-utils: Add subcommand "absolute_path" + - git-check-attr: Normalize paths + - git-check-attr: Demonstrate problems with relative paths + - git-check-attr: Demonstrate problems with unnormalized paths + - git-check-attr: test that no output is written to stderr + (this branch uses mh/check-attr-listing.) + +-------------------------------------------------- +[Graduated to "master"] + +* 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.) + +* 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. + +* 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 + +* sr/transport-helper-fix (2011-07-19) 21 commits + (merged to 'next' on 2011-07-19 at e1ef414) + + transport-helper: die early on encountering deleted refs + + transport-helper: implement marks location as capability + + transport-helper: Use capname for refspec capability too + + transport-helper: change import semantics + + transport-helper: update ref status after push with export + + transport-helper: use the new done feature where possible + + transport-helper: check status code of finish_command + + transport-helper: factor out push_update_refs_status + + fast-export: support done feature + + fast-import: introduce 'done' command + + git-remote-testgit: fix error handling + + git-remote-testgit: only push for non-local repositories + + remote-curl: accept empty line as terminator + + remote-helpers: export GIT_DIR variable to helpers + + git_remote_helpers: push all refs during a non-local export + + transport-helper: don't feed bogus refs to export push + + git-remote-testgit: import non-HEAD refs + + t5800: document some non-functional parts of remote helpers + + t5800: use skip_all instead of prereq + + t5800: factor out some ref tests + + transport-helper: fix minor leak in push_refs_with_export + (this branch is used by sr/transport-helper-fix-rfc.) + +* vi/make-test-vector-less-specific (2011-07-19) 1 commit + (merged to 'next' on 2011-07-25 at 1973192) + + tests: cleanup binary test vector files -------------------------------------------------- [Stalled] @@ -74,23 +180,30 @@ numbers is already in; backburnered. -------------------------------------------------- [Cooking] -* jc/streaming-filter (2011-07-22) 1 commit - (merged to 'next' on 2011-07-22 at 2081cd7) - + streaming: free git_istream upon closing +* cb/maint-exec-error-report (2011-08-01) 2 commits + - notice error exit from pager + - error_routine: use parent's stderr if exec fails -A large leak found and plugged. -Will merge to "master". +* cb/maint-quiet-push (2011-07-31) 1 commit + (merged to 'next' on 2011-08-01 at 87df938) + + propagate --quiet to send-pack/receive-pack -* jn/gitweb-system-config (2011-07-24) 1 commit - - gitweb: Introduce common system-wide settings for convenience +* jl/submodule-update-quiet (2011-07-28) 1 commit + (merged to 'next' on 2011-08-01 at c611587) + + submodule: update and add must honor --quiet flag -Will merge to "next". +* jn/gitweb-config-list-case (2011-07-31) 1 commit + (merged to 'next' on 2011-08-01 at 9268738) + + gitweb: Git config keys are case insensitive, make config search too -* 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. +* jn/gitweb-system-config (2011-07-24) 1 commit + (merged to 'next' on 2011-08-01 at 4941e45) + + gitweb: Introduce common system-wide settings for convenience -Will merge to "next". +* js/ls-tree-error (2011-07-25) 2 commits + (merged to 'next' on 2011-08-01 at 61bae55) + + 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 @@ -99,9 +212,8 @@ Will merge to "next". 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". + (merged to 'next' on 2011-08-01 at 6c88837) + + reset: give better reflog messages * jk/add-i-hunk-filter (2011-07-27) 5 commits - add--interactive: add option to autosplit hunks @@ -110,7 +222,7 @@ Will merge to "next". - add--interactive: factor out regex error handling - add--interactive: refactor patch mode argument processing -* mh/check-attr-listing (2011-07-27) 19 commits +* mh/check-attr-listing (2011-08-02) 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 @@ -130,49 +242,34 @@ Will merge to "next". - Remove anachronism from comment - doc: Correct git_attr() calls in example code - doc: Add a link from gitattributes(5) to git-check-attr(1) + (this branch is used by mh/check-attr-relative.) -Need to replace this with a more recent reroll. - -* 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". +Except for a few nits, this seems mostly ready. * 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() - (this branch uses jc/maint-reset-unmerged-path.) - -Will merge to "next". + (merged to 'next' on 2011-08-01 at 98d8b08) + + diff-lib: refactor run_diff_index() and do_diff_cache() + + diff-lib: simplify do_diff_cache() * sr/transport-helper-fix-rfc (2011-07-19) 2 commits - t5800: point out that deleting branches does not work - t5800: document inability to push new branch with old content - (this branch uses sr/transport-helper-fix.) -* vi/make-test-vector-less-specific (2011-07-19) 1 commit - (merged to 'next' on 2011-07-25 at 1973192) - + tests: cleanup binary test vector files - -Will merge to "master". - -* jk/http-auth-keyring (2011-07-21) 14 commits - - credentials: add "getpass" helper - - credentials: add "store" helper - - credentials: add "cache" helper - - docs: end-user documentation for the credential subsystem - - http: use hostname in credential description - - 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 +* jk/http-auth-keyring (2011-08-03) 13 commits + (merged to 'next' on 2011-08-03 at b06e80e) + + credentials: add "getpass" helper + + credentials: add "store" helper + + credentials: add "cache" helper + + docs: end-user documentation for the credential subsystem + + http: use hostname in credential description + + allow the user to configure credential helpers + + look for credentials in config before prompting + + http: use credential API to get passwords + + 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 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 @@ -182,42 +279,6 @@ for different repositories. (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) - + transport-helper: die early on encountering deleted refs - + transport-helper: implement marks location as capability - + transport-helper: Use capname for refspec capability too - + transport-helper: change import semantics - + transport-helper: update ref status after push with export - + transport-helper: use the new done feature where possible - + transport-helper: check status code of finish_command - + transport-helper: factor out push_update_refs_status - + fast-export: support done feature - + fast-import: introduce 'done' command - + git-remote-testgit: fix error handling - + git-remote-testgit: only push for non-local repositories - + remote-curl: accept empty line as terminator - + remote-helpers: export GIT_DIR variable to helpers - + git_remote_helpers: push all refs during a non-local export - + transport-helper: don't feed bogus refs to export push - + git-remote-testgit: import non-HEAD refs - + t5800: document some non-functional parts of remote helpers - + t5800: use skip_all instead of prereq - + t5800: factor out some ref tests - + transport-helper: fix minor leak in push_refs_with_export - (this branch is used by sr/transport-helper-fix-rfc.) - -Will merge to "master". - -* 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 - -Will merge to "master". - * jc/pack-order-tweak (2011-07-08) 2 commits (merged to 'next' on 2011-07-25 at 1460c31) + pack-objects: optimize "recency order" @@ -231,7 +292,14 @@ Will merge to "master". + ref namespaces: infrastructure + Fix prefix handling in ref iteration functions -* rc/histogram-diff (2011-07-12) 7 commits +* rc/histogram-diff (2011-08-03) 13 commits + - fixup! xdiff/xhistogram: rework handling of recursed results + - xdiff/xhistogram: drop need for additional variable + - xdiff/xhistogram: rely on xdl_trim_ends() + - xdiff/xhistogram: rework handling of recursed results + - xdiff: do away with xdl_mmfile_next() + (merged to 'next' on 2011-08-03 at f9e2328) + + Make test number unique (merged to 'next' on 2011-07-25 at 3351028) + xdiff/xprepare: use a smaller sample size for histogram diff + xdiff/xprepare: skip classification @@ -241,9 +309,10 @@ Will merge to "master". + xdiff/xprepare: refactor abort cleanups + xdiff/xprepare: use memset() -* rr/revert-cherry-pick-continue (2011-07-27) 18 commits +* rr/revert-cherry-pick-continue (2011-08-01) 18 commits + - revert: Propagate errors upwards from do_pick_commit - revert: Introduce --continue to continue the operation - - revert: Don't implictly stomp pending sequencer operation + - revert: Don't implicitly stomp pending sequencer operation - revert: Remove sequencer state when no commits are pending - reset: Make reset remove the sequencer state - revert: Introduce --reset to remove sequencer state @@ -254,14 +323,14 @@ Will merge to "master". - revert: Separate cmdline parsing from functional code - revert: Introduce struct to keep command-line options - revert: Eliminate global "commit" variable - - revert: Propogate errors upwards from do_pick_commit - revert: Rename no_replay to record_origin - revert: Don't check lone argument in get_encoding - revert: Simplify and inline add_message_to_msg - config: Introduce functions to write non-standard file - advice: Introduce error_resolve_conflict -Need to replace this with a more recent reroll. +Rerolled (v5) and looked reasonably clean. +Will merge to "next". * en/merge-recursive (2011-07-14) 50 commits - fixup! Do not assume that qsort is stable @@ -315,4 +384,6 @@ Need to replace this with a more recent reroll. - t6042: Add failing testcase for rename/modify/add-source conflict - t6042: Add a testcase where git deletes an untracked file -Looked at up to 38/48; looks basically sound. +The tip one should be squashed somewhere. I wanted to push this out in +'next' today, but this seems to regress a rather trivial renaming merge, +so I had to rewind and rebuild 'next' before pushing it out. -- 2.47.3