What's cooking (2013/08 #01)

index eef6d9cf4c..283f9bea92 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,18 +1,18 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Jul 2013, #10; Wed, 31) -X-master-at: 8dc84fdc48a79c70682e6c361a82d0f3e1db9a03 -X-next-at: 025c443e44c008c3a3dd7b83658f4e9734343e53 +Subject: What's cooking in git.git (Aug 2013, #01; Thu, 1) +X-master-at: 304852fc77847e649c746db95e9c4675c03ee567 +X-next-at: d151a9437b346971b08e58455c2b1333b2139cdc -What's cooking in git.git (Jul 2013, #10; Wed, 31) +What's cooking in git.git (Aug 2013, #01; Thu, 1) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. -Hopefully the 1.8.4-rc1 tomorrow with topics marked for 'master' -in this issue of "What's cooking" report. +The first release candidate v1.8.4-rc1 has been tagged; only +regression fixes and l10n updates from now on. You can find the changes described here in the integration branches of the repositories listed at @@ -22,118 +22,57 @@ of the repositories listed at -------------------------------------------------- [Graduated to "master"] -* bc/completion-for-bash-3.0 (2013-07-24) 1 commit - (merged to 'next' on 2013-07-24 at 913d89c) - + git-completion.bash: replace zsh notation that breaks bash 3.X - - -* ds/doc-two-kinds-of-tags (2013-07-29) 1 commit - (merged to 'next' on 2013-07-30 at 1201ca7) - + docs/git-tag: explain lightweight versus annotated tags - - -* jk/capabilities-doc (2013-07-26) 5 commits - (merged to 'next' on 2013-07-29 at cf3f07e) - + document 'allow-tip-sha1-in-want' capability - (merged to 'next' on 2013-07-24 at 5af9a33) - + document 'quiet' receive-pack capability - + document 'agent' protocol capability - + docs: note that receive-pack knows side-band-64k capability - + docs: fix 'report-status' protocol capability thinko - - -* jk/commit-how-to-abort-cherry-pick (2013-07-29) 1 commit - (merged to 'next' on 2013-07-30 at 7b1c49c) - + commit: tweak empty cherry pick advice for sequencer - +* jc/rm-submodule-error-message (2013-07-25) 1 commit + + builtin/rm.c: consolidate error reporting for removing submodules -* mh/packed-refs-do-one-ref-recursion (2013-07-17) 1 commit - (merged to 'next' on 2013-07-30 at d8cc1ee) - + do_one_ref(): save and restore value of current_ref - Fix a NULL-pointer dereference during nested iterations over - references (for example, when replace references are being used). +* jx/clean-interactive (2013-07-24) 2 commits + (merged to 'next' on 2013-07-30 at b7fd474) + + git-clean: implement partial matching for selection + (merged to 'next' on 2013-07-24 at 1e63bb9) + + Documentation/git-clean: fix description for range -* rj/commit-slab-fix (2013-07-29) 1 commit - (merged to 'next' on 2013-07-30 at 1914f37) - + commit-slab.h: Fix memory allocation and addressing +* lf/echo-n-is-not-portable (2013-07-29) 1 commit + (merged to 'next' on 2013-07-30 at e223ceb) + + Avoid using `echo -n` anywhere -* rr/maint-tilde-markup-in-doc (2013-07-26) 1 commit - (merged to 'next' on 2013-07-30 at c8f83d5) - + config doc: quote paths, fixing tilde-interpretation +* ma/hg-to-git (2013-07-23) 1 commit + (merged to 'next' on 2013-07-30 at 1dddc06) + + hg-to-git: --allow-empty-message in git commit -* rr/rebase-autostash (2013-07-29) 1 commit - (merged to 'next' on 2013-07-30 at 0095e2d) - + git-rebase: fix typo +* ms/subtree-install-fix (2013-07-30) 1 commit + + contrib/subtree: Fix make install target -* sb/mailmap-updates (2013-07-24) 1 commit - (merged to 'next' on 2013-07-24 at 9f8e681) - + .mailmap: combine more (email, name) to individual persons +* ob/typofixes (2013-07-29) 1 commit + (merged to 'next' on 2013-07-30 at ec2c897) + + many small typofixes -------------------------------------------------- [New Topics] -* bc/unuse-packfile (2013-07-30) 1 commit - - sha1_file: introduce close_one_pack() to close packs on fd pressure +* mb/docs-favor-en-us (2013-08-01) 1 commit + - Provide some linguistic guidance for the documentation. Will merge to and cook in 'next'. -* da/darwin (2013-07-30) 1 commit - - imap-send: use Apple's Security framework for base64 encoding - - Will merge to and cook in 'next'. - - -* jc/rm-submodule-error-message (2013-07-25) 1 commit - - builtin/rm.c: consolidate error reporting for removing submodules - - Consolidate two messages phrased subtly differently without a good - reason. +* jc/parseopt-command-modes (2013-07-30) 2 commits + - tag: use OPT_CMDMODE + - parse-options: add OPT_CMDMODE() - Will merge to 'next' and then to 'master', unless there is an objection. - - -* ms/subtree-install-fix (2013-07-30) 1 commit - - contrib/subtree: Fix make install target - - Will merge to 'next' and then to 'master'. - - -* nd/sq-quote-buf (2013-07-30) 3 commits - - quote: remove sq_quote_print() - - tar-tree: remove dependency on sq_quote_print() - - for-each-ref, quote: convert *_quote_print -> *_quote_buf - - Code simplification as a preparatory step to something larger. - - Will merge to and cook in 'next'. - - -* jc/url-match (2013-07-31) 6 commits - - config: "git config --get-urlmatch" parses section.<url>.key - - builtin/config: refactor collect_config() - - config: parse http.<url>.<variable> using urlmatch - - config: add generic callback wrapper to parse section.<url>.key - - config: add helper to normalize and match URLs - - http.c: fix parsing of http.sslCertPasswordProtected variable - - Reroll of km/http-curl-config-per-url topic. - - Will merge to and cook in 'next' + Many commands use --dashed-option as a operation mode selector + (e.g. "git tag --delete") that the user can use at most one + (e.g. "git tag --delete --verify" is a nonsense) and you cannot + negate (e.g. "git tag --no-delete" is a nonsense). Make it easier + for users of parse_options() to enforce these restrictions. -------------------------------------------------- [Stalled] -* tr/log-full-diff-keep-true-parents (2013-07-29) 2 commits - - SQUASH??? free saved-parents slab when done - - [PERHAPS LIKE THIS] log: use true parents for diff even when rewriting - - * tf/gitweb-ss-tweak (2013-07-15) 4 commits - gitweb: make search help link less ugly - gitweb: omit the repository owner when it is unset @@ -239,6 +178,61 @@ of the repositories listed at -------------------------------------------------- [Cooking] +* tr/log-full-diff-keep-true-parents (2013-08-01) 1 commit + - log: use true parents for diff even when rewriting + + Output from "git log --full-diff -- <pathspec>" looked strange, + because comparison was done with the previous ancestor that touched + the specified <pathspec>, causing the patches for paths outside the + pathspec to show more than the single commit has changed. + + I am not sure if that is necessarily a problem, though. Output + from "git log --full-diff -2 -- <pathspec>" without this change + will be applicable to some codebase, but after this change that + will no longer be true (you will get only tiny parts of the change + that were made by the two commits in question, while missing all + the other changes). + + +* bc/unuse-packfile (2013-08-01) 2 commits + - Don't close pack fd when free'ing pack windows + - sha1_file: introduce close_one_pack() to close packs on fd pressure + + Will merge to and cook in 'next'. + + +* da/darwin (2013-07-30) 1 commit + (merged to 'next' on 2013-08-01 at d151a94) + + imap-send: use Apple's Security framework for base64 encoding + + Will cook in 'next'. + + +* nd/sq-quote-buf (2013-07-30) 3 commits + (merged to 'next' on 2013-08-01 at dc7934a) + + quote: remove sq_quote_print() + + tar-tree: remove dependency on sq_quote_print() + + for-each-ref, quote: convert *_quote_print -> *_quote_buf + + Code simplification as a preparatory step to something larger. + + Will cook in 'next'. + + +* jc/url-match (2013-07-31) 6 commits + - config: "git config --get-urlmatch" parses section.<url>.key + - builtin/config: refactor collect_config() + - config: parse http.<url>.<variable> using urlmatch + - config: add generic callback wrapper to parse section.<url>.key + - config: add helper to normalize and match URLs + - http.c: fix parsing of http.sslCertPasswordProtected variable + + Reroll of km/http-curl-config-per-url topic. Peff raises many good + points about the tests for http.* variables. + + Waiting for the discussion to conclude, hopefully with a replacement test. + + * jl/submodule-mv (2013-07-30) 5 commits - rm: delete .gitmodules entry of submodules removed from the work tree - mv: update the path entry in .gitmodules for moved submodules @@ -254,20 +248,6 @@ of the repositories listed at Waiting for a reroll. -* ob/typofixes (2013-07-29) 1 commit - (merged to 'next' on 2013-07-30 at ec2c897) - + many small typofixes - - Will merge to 'next'. - - -* ma/hg-to-git (2013-07-23) 1 commit - (merged to 'next' on 2013-07-30 at 1dddc06) - + hg-to-git: --allow-empty-message in git commit - - Will merge to 'master'. - - * nd/clone-connectivity-shortcut (2013-07-23) 1 commit (merged to 'next' on 2013-07-30 at 8d16721) + smart http: use the same connectivity check on cloning @@ -275,15 +255,6 @@ of the repositories listed at Will cook in 'next'. -* jx/clean-interactive (2013-07-24) 2 commits - (merged to 'next' on 2013-07-30 at b7fd474) - + git-clean: implement partial matching for selection - (merged to 'next' on 2013-07-24 at 1e63bb9) - + Documentation/git-clean: fix description for range - - Will merge to 'master'. - - * db/http-savecookies (2013-07-30) 1 commit (merged to 'next' on 2013-07-30 at d2ad6e5) + http: add http.savecookies option to write out HTTP cookies @@ -291,13 +262,6 @@ of the repositories listed at Will cook in 'next'. -* lf/echo-n-is-not-portable (2013-07-29) 1 commit - (merged to 'next' on 2013-07-30 at e223ceb) - + Avoid using `echo -n` anywhere - - Will merge to 'master'. - - * sb/fsck-opt-bool (2013-07-29) 1 commit (merged to 'next' on 2013-07-30 at 8a9964c) + fsck: Replace deprecated OPT_BOOLEAN by OPT_BOOL @@ -464,7 +428,9 @@ of the repositories listed at Will hold, until we get any user. -* jc/push-cas (2013-07-22) 6 commits +* jc/push-cas (2013-08-01) 7 commits + (merged to 'next' on 2013-08-01 at a7604ee) + + t5540/5541: smart-http does not support "--force-with-lease" (merged to 'next' on 2013-07-23 at 72371b0) + t5533: test "push --force-with-lease" + push --force-with-lease: tie it all together @@ -487,6 +453,9 @@ of the repositories listed at defeating the safety pretty easily). It is suitable only for the simplest workflows, and it may hurt users more than it helps them. + Also, smart-http needs to be taught about this before we can move + it forward. + Will cook in 'next'. @@ -509,7 +478,8 @@ of the repositories listed at * rj/cygwin-clarify-use-of-cheating-lstat (2013-07-18) 1 commit - - cygwin: Remove the Win32 l/stat() implementation + (merged to 'next' on 2013-08-01 at 3ebfe7c) + + cygwin: Remove the Win32 l/stat() implementation Cygwin port added a "not quite correct but a lot faster and good enough for many lstat() calls that are only used to see if the @@ -517,7 +487,11 @@ of the repositories listed at time ago, and it started biting us in places. This removes it and uses the standard lstat() that comes with Cygwin. - Will merge to and cook in 'next'. + Recent topic that uses lstat on packed-refs file is broken when + this cheating lstat is used, and this is a simplest fix that is + also the cleanest direction to go in the long run. + + Will merge to 'master'. * jc/reflog-doc (2013-06-19) 1 commit @@ -589,4 +563,3 @@ of the repositories listed at + http.c: fix parsing of http.sslCertPasswordProtected variable Reverted to be replaced with a reroll (jc/url-match topic). -