From: Junio C Hamano Date: Tue, 8 Dec 2009 09:18:18 +0000 (-0800) Subject: What's cooking (2009/12 #03) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa357dd51cc1f6b60904250e646184a6b8cc6653;p=thirdparty%2Fgit.git What's cooking (2009/12 #03) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 3d08932c01..92f4df8df5 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, #02; Sat, 05) -X-master-at: 9a424b276c409a3510e7735b6ecc012f50dc2a49 -X-next-at: d8fe1b5dc75e54be82e59239a8d5a430ae072fd8 +Subject: What's cooking in git.git (Dec 2009, #03; Tue, 08) +X-master-at: f9ad77a739c0d012ee58b64eda2d7ec0d4e1df9d +X-next-at: 3c2c08adfbff17e13665b5151a337380f57275d8 -What's cooking in git.git (Dec 2009, #02; Sat, 05) +What's cooking in git.git (Dec 2009, #03; Tue, 08) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -11,79 +11,46 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. -In 1.7.0, we plan to correct handful of warts in the interfaces everybody -agrees that they were mistakes. The resulting system may not be strictly -backward compatible. Currently planned changes are: - - * refuse push to update the checked out branch in a non-bare repo by - default - - Make "git push" into a repository to update the branch that is checked - out fail by default. You can countermand this default by setting a - configuration variable in the receiving repository. - - http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007 - - * refuse push to delete the current branch by default - - Make "git push $there :$killed" to delete the branch that is pointed at - by its HEAD fail by default. You can countermand this default by - setting a configuration variable in the receiving repository. - - http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936 +-------------------------------------------------- +[New Topics] - * "git send-email" won't make deep threads by default +* 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 - Many people said that by default when sending more than 2 patches the - threading git-send-email makes by default is hard to read, and they - prefer the default be one cover letter and each patch as a direct - follow-up to the cover letter. You can countermand this by setting a - configuration variable. +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. - http://article.gmane.org/gmane.comp.version-control.git/109790 +* il/vcs-helper (2009-12-06) 8 commits + - Remove special casing of http, https and ftp + - Support remote archive from external protocol helpers + - 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 is related to sr/vcs-helper.) - * "git status" won't be "git-commit --dry-run" anymore +Under active discussion and review; another round expected. - http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993 +* jh/commit-status (2009-12-07) 1 commit + - [test?] Add commit.status, --status, and --no-status - * "git diff -w --exit-code" will exit success if only differences it - found are whitespace changes that are stripped away from the output. +* 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 - http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751 +Fixes a regression in 1.6.5.3. - * "git diff -w/-b" won't even produce "diff --git" header when all changes - are about whitespaces. +* mm/diag-path-in-treeish (2009-12-07) 1 commit + - Detailed diagnosis when parsing an object name fails. - http://thread.gmane.org/gmane.comp.version-control.git/133256 - --------------------------------------------------- -[New Topics] - -Note: Ilari's vcs-helper series hasn't been queued yet, as its first round -generated a healthy amount of discussion and he made it clear that the -second round is being prepared, addressing the comments given on the list. -Hopefully trivial coding style issues in the first round will also be -fixed (e.g. keyword "if" lacked a SP after it before opening parenthesis -of the condition) in the second round. - -* 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. - -* 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-05) 4 commits - - [squash to Add a command "fix"] Avoid "\(alternatives\|choices\)" in sed script - - Add a command "fix" to rebase --interactive. - - t3404: set a couple more tags in the original repository - - t3404: Better document the original repository layout +* ns/rebase-auto-squash (2009-12-08) 1 commit + - rebase -i --autosquash: auto-squash commits + (this branch uses mh/rebase-fixup.) -------------------------------------------------- [Stalled] @@ -105,21 +72,6 @@ says "no"?) 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. -* jh/notes (2009-12-02) 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 (waiting for Acks). - * 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 @@ -155,6 +107,45 @@ all the header files in the tree, for example. -------------------------------------------------- [Cooking] +* 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. + +* 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. + +* 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 @@ -185,22 +176,24 @@ but otherwise seemed good. Rerolled. * tr/http-updates (2009-12-01) 3 commits - - Allow curl to rewind the RPC read buffer - - Add an option for using any HTTP authentication scheme, not only basic - - http: maintain curl sessions - -There was a discussion on a better structure not to require rewinding in -the first place? I didn't follow it closely... + (merged to 'next' on 2009-12-07 at f08d447) + + Allow curl to rewind the RPC read buffer + + Add an option for using any HTTP authentication scheme, not only basic + + http: maintain curl sessions * jc/diff-whitespace-prepare (2009-11-28) 2 commits - diff: flip the default diff.bwoutputonly to true - diff: optionally allow traditional "-b/-w affects only output" semantics (this branch uses gb/1.7.0-diff-whitespace-only-output and jc/1.7.0-diff-whitespace-only-status; is used by jc/1.7.0-diff-whitespace-prepare.) -This is to redo the two -b/-w semantic changes to prepare the migration of -existing users before 1.7.0 happens. +This was to redo the two -b/-w semantic changes to prepare the migration of +existing users before 1.7.0 happens, but I think we should drop it. + +Comments? -* sr/vcs-helper (2009-12-04) 13 commits +* sr/vcs-helper (2009-12-07) 14 commits + (merged to 'next' on 2009-12-07 at 8f041bc) + + tests: handle NO_PYTHON setting (merged to 'next' on 2009-12-03 at e45b562) + builtin-push: don't access freed transport->url (merged to 'next' on 2009-11-27 at 83268ab) @@ -216,6 +209,7 @@ existing users before 1.7.0 happens. + Use a function to determine whether a remote is valid + Allow programs to not depend on remotes having urls + Fix memory leak in helper method for disconnect + (this branch is related to il/vcs-helper.) Should be among the first to graduate after 1.6.6 final. @@ -227,6 +221,8 @@ I do not particularly like a configuration like this that changes the behaviour of a command in a drastic way---it will make helping others much harder. +Comments? + * nd/sparse (2009-11-25) 20 commits. (merged to 'next' on 2009-11-25 at 71380f5) + tests: rename duplicate t1009 @@ -258,7 +254,10 @@ Fix-up expected. -------------------------------------------------- [For 1.7.0] -* jk/1.7.0-status (2009-12-05) 9 commits. +* jk/1.7.0-status (2009-12-07) 11 commits. + (merged to 'next' on 2009-12-07 at 7723acf) + + status: reduce duplicated setup code + + status: disable color for porcelain format (merged to 'next' on 2009-12-05 at 44dcefd) + status -s: obey color.status + builtin-commit: refactor short-status code into wt-status.c @@ -327,6 +326,8 @@ Likewise but for the output of "diff --git" headers. (this branch uses gb/1.7.0-diff-whitespace-only-output, jc/1.7.0-diff-whitespace-only-status and jc/diff-whitespace-prepare.) And this is to actually flip the default and eventually remove the warning. +As I am contemplating of dropping jc/diff-whitespace-prepare, this should +also be dropped as well. * ns/1.7.0-send-email-no-chain-reply-to (2009-08-22) 1 commit - send-email: make --no-chain-reply-to the default @@ -357,42 +358,3 @@ fix from Ramsay is already in 'master'. Reverted out of 'next', to be replaced with jn/faster-completion-startup topic. - --------------------------------------------------- -[I have been too busy to purge these] - -* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit - . git-pull.sh --rebase: overhaul error handling when no candidates are found - -Replaced. - -* jc/log-tz (2009-03-03) 1 commit. - - Allow --date=local --date=other-format to work as expected - -Maybe some people care about this. I dunno. - -* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit. - . git-merge: forbid fast-forward and up-to-date when --no-commit is given - -This makes "git merge --no-commit" fail when it results in fast-forward or -up-to-date. It appears nobody wants to have this, so I dropped it. - -* ne/rev-cache (2009-10-19) 7 commits. - . support for commit grafts, slight change to general mechanism - . support for path name caching in rev-cache - . full integration of rev-cache into git, completed test suite - . administrative functions for rev-cache, start of integration into git - . support for non-commit object caching in rev-cache - . basic revision cache system, no integration or features - . man page and technical discussion for rev-cache - -The author indicated that there is another round coming. Does not seem to -pass the tests when merged to 'pu', so it has been ejected for now. - -* pb/gitweb-no-project-list (2009-11-06) 3 commits. - . gitweb: Polish the content tags support - . gitweb: Support for no project list on gitweb front page - . gitweb: Refactor project list routines - -I picked these up but didn't queue as Warthog9's comments made certain -amount of sense to me.