From 1c3f427882dbe1c63ccdaf86741837dfbb981051 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 28 Dec 2009 01:54:57 -0800 Subject: [PATCH] What's cooking (2009/12 #05) --- whats-cooking.txt | 520 +++++++++++++++++++--------------------------- 1 file changed, 219 insertions(+), 301 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 7ed9b6eeba..4466a294fe 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 (Dec 2009, #04; Wed, 09) -X-master-at: 80d93611c55fec171e0d9aba98db079952f9d7aa -X-next-at: 245e2a65f71e0255a90a3c45ea82bcdd19f85eff +Subject: What's cooking in git.git (Dec 2009, #05; Mon, 28) +X-master-at: c2ff10c98e22ae64d553273e6d67bb123a1c916f +X-next-at: ba67783643e94c85cfa57edf932dea2abdf68711 -What's cooking in git.git (Dec 2009, #04; Wed, 09) +What's cooking in git.git (Dec 2009, #05; Mon, 28) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -14,199 +14,6 @@ still holding onto them. -------------------------------------------------- [Graduated to "master"] -* jk/maint-add-p-delete-fix (2009-12-08) 1 commit. - (merged to 'next' on 2009-12-08 at 3c2c08a) - + add-interactive: fix deletion of non-empty files - -Fixes a regression in 1.6.5.3. - -* jn/maint-pull-rebase-error-message (2009-11-27) 1 commit. - (merged to 'next' on 2009-12-03 at 2ced03c) - + pull: clarify advice for the unconfigured error case - -Replaces old 'jn/rfc-pull-rebase-error-message' topic. - --------------------------------------------------- -[New Topics] - -* cc/reset-more (2009-12-08) 6 commits - - Documentation: reset: add some tables to describe the different options - - Documentation: reset: describe new "--keep-local-changes" option - - reset: add test cases for "--keep-local-changes" option - - reset: add option "--keep-local-changes" to "git reset" - - reset: use "unpack_trees()" directly instead of "git read-tree" - - reset: add a few tests for "git reset --merge" - -The documentation is much clearer than the previous round in describing -what it does, but I find it a bit unclear in describing what it is _good_ -for (iow, scenarios and use cases). - -Breaks 'pu' and does not pass test on its own yet. - -* tr/http-push-ref-status (2009-12-08) 3 commits - - transport-helper.c::push_refs(): emit "no refs" error message - - transport.c::transport_push(): make ref status affect return value - - refactor ref status logic for pushing - --------------------------------------------------- -[Stalled] - -* je/send-email-no-subject (2009-08-05) 1 commit. - (merged to 'next' on 2009-10-11 at 1b99c56) - + send-email: confirm on empty mail subjects - -The existing tests cover the positive case (i.e. as long as the user says -"yes" to the "do you really want to send this message that lacks subject", -the message is sent) of this feature, but the feature itself needs its own -test to verify the negative case (i.e. does it correctly stop if the user -says "no"?) - -* jc/checkout-merge-base (2009-11-20) 2 commits - - "rebase --onto A...B" replays history on the merge base between A and B - - "checkout A...B" switches to the merge base between A and B - -I've been using the first one for a while myself but do not see many users -want this (yet); the new feature is not urgent anyway. - -* tr/maint-merge-ours-clarification (2009-11-15) 1 commit - (merged to 'next' on 2009-11-21 at fadaf7b) - + rebase: refuse to rebase with -s ours - -I do not think we reached a concensus for solving conflicts between "give -them rope" and "protect users from clearly meaningless combinations". The -author obviously is for the latter (and I am inclined to agree); Dscho -seems to think otherwise. - -* jc/fix-tree-walk (2009-10-22) 8 commits - (merged to 'next' on 2009-10-22 at 10c0c8f) - + Revert failed attempt since 353c5ee - + read-tree --debug-unpack - (merged to 'next' on 2009-10-11 at 0b058e2) - + unpack-trees.c: look ahead in the index - + unpack-trees.c: prepare for looking ahead in the index - + Aggressive three-way merge: fix D/F case - + traverse_trees(): handle D/F conflict case sanely - + more D/F conflict tests - + tests: move convenience regexp to match object names to test-lib.sh - -This has some stupid bugs and reverted from 'next' until I can fix it, but -the "temporarily" turned out to be very loooong. Sigh. We won't have a -proper fix in 1.6.6. - --------------------------------------------------- -[Cooking] - -* bg/maint-add-all-doc (2009-12-07) 4 commits. - - squash! rm documentation--also mention add-u where we mention commit-a - - git-rm doc: Describe how to sync index & work tree - - git-add/rm doc: Consistently back-quote - - Documentation: 'git add -A' can remove files - -I didn't like the existing documentation for "add -u" myself (especially -because I wrote the initial version) and this neatly fix it as well. - -* il/vcs-helper (2009-12-09) 8 commits - - Remove special casing of http, https and ftp - - Support remote archive from all smart transports - - Support remote helpers implementing smart transports - - Support taking over transports - - Refactor git transport options parsing - - Pass unknown protocols to external protocol handlers - - Support mandatory capabilities - - Add remote helper debug mode - (this branch uses early parts of sr/vcs-helper.) - -Yet another round. - -* jh/commit-status (2009-12-07) 1 commit - - [test?] Add commit.status, --status, and --no-status - -* mm/diag-path-in-treeish (2009-12-07) 1 commit - - Detailed diagnosis when parsing an object name fails. - -* ns/rebase-auto-squash (2009-12-08) 2 commits - - fixup! rebase -i --autosquash - - rebase -i --autosquash: auto-squash commits - (this branch uses mh/rebase-fixup.) - -* jh/notes (2009-12-07) 11 commits - - Refactor notes concatenation into a flexible interface for combining notes - - Notes API: Allow multiple concurrent notes trees with new struct notes_tree - - Notes API: for_each_note(): Traverse the entire notes tree with a callback - - Notes API: get_note(): Return the note annotating the given object - - Notes API: add_note(): Add note objects to the internal notes tree structure - - Notes API: init_notes(): Initialize the notes tree from the given notes ref - - Notes API: get_commit_notes() -> format_note() + remove the commit restriction - - Minor style fixes to notes.c - - Add more testcases to test fast-import of notes - - Rename t9301 to t9350, to make room for more fast-import tests - - fast-import: Proper notes tree manipulation - -Rerolled and under discussion. - -* fc/opt-quiet-gc-reset (2009-12-02) 1 commit - - General --quiet improvements - -* mv/commit-date (2009-12-03) 2 commits - - Document date formats accepted by parse_date() - - builtin-commit: add --date option - -* mh/rebase-fixup (2009-12-07) 2 commits - - Add a command "fixup" to rebase --interactive - - t3404: Use test_commit to set up test repository - (this branch is used by ns/rebase-auto-squash.) - -Initial round of "fixup" action that is similar to "squash" action in -"rebase -i" that excludes the commit log message from follow-up commits -when composing the log message for the updated one. Expected is a further -improvement to skip opening the editor if a pick is followed only by -"fixup" and no "squash". - -* sr/gfi-options (2009-12-04) 7 commits - - fast-import: add (non-)relative-marks feature - - fast-import: allow for multiple --import-marks= arguments - - fast-import: test the new option command - - fast-import: add option command - - fast-import: add feature command - - fast-import: put marks reading in its own function - - fast-import: put option parsing code in separate functions - -Rerolled. - -* ap/merge-backend-opts (2008-07-18) 6 commits - - Document that merge strategies can now take their own options - - Extend merge-subtree tests to test -Xsubtree=dir. - - Make "subtree" part more orthogonal to the rest of merge-recursive. - - Teach git-pull to pass -X