What's cooking (2009/02 #05)

diff --git a/whats-cooking.txt b/whats-cooking.txt
index 7f09148f383720615d979c4dc5ae5eab4844c134..6b369e5fffd25b249747d3a99d6cbf89f6364114 100644 (file)
--- a/whats-cooking.txt
+++ b/whats-cooking.txt
@@ -1,9 +1,9 @@
 To: git@vger.kernel.org
-Subject: What's cooking in git.git (Feb 2009, #04; Sun, 15)
-X-master-at: 075394e26cd7fb38e08d5f637a5fc825ab0b3fb3
-X-next-at: 607872276f2e9c2cf5c5bb05e9a9a741f3792148
+Subject: What's cooking in git.git (Feb 2009, #05; Mon, 16)
+X-master-at: 81d3fe9f4871e42ebd1af0221fa091fe5476e2f7
+X-next-at: fe6246962442d691150184fe12c71dd019e1b41f
 
-What's cooking in git.git (Feb 2009, #04; Sun, 15)
+What's cooking in git.git (Feb 2009, #05; Mon, 16)
 --------------------------------------------------
 
 Here are the topics that have been cooking.  Commits prefixed with '-' are
@@ -14,95 +14,42 @@ holding onto them.
 The topics list the commits in reverse chronological order.  The topics
 meant to be merged to the maintenance series have "maint-" in their names.
 
-The master branch will be tagged as 1.6.2-rc1 by the end of the long
-weekend.
+The master branch is slightly past 1.6.2-rc1.
 
-Traditionally, rc freeze, especially post -rc1, meant that I stop paying
-attention to whatever topic that did not graduate to 'master', and not
-queuing further updates to 'next' to encourage people to concentrate on
-'master' bugfixes by discouraging them from tinkering the topics that
-won't be in the next release.
-
-I do not think that approach has worked well in practice, so let's try
-something slightly different.
-
-I'll try to leave 'next' open during this freeze, but the new topics and
-topics that hasn't cooked to maturity by -rc1 will not be in 1.6.2 (that
-is what a freeze means).
+As an experiment, 'next' and 'pu' stay open during this release freeze;
+new topics are accepted as time permits, but people are much more strongly
+encouraged to find issues on what is already on 'master', and patches to
+fix them always takes precedence over what is still on 'next' and will
+never graduate until 1.6.2 final.
 
 ----------------------------------------------------------------
 [New Topics]
 
-* jw/imap-preformatted-html (Thu Feb 12 08:58:12 2009 -0600) 1 commit
- - imap.preformattedHTML to tell Thunderbird to send non-flowed text
-
-The patch text should be identical to Jeremy's "Virtual Patch", except
-that the configuration variable was renamed per list discussion.
-
-* jw/format-patch-attach (Thu Feb 12 09:51:55 2009 -0600) 1 commit
- - Enable setting attach as the default in .gitconfig for git-format-
-   patch.
-
-* sr/force-rebase (Fri Feb 13 23:48:01 2009 +0100) 1 commit
- - Teach rebase to rebase even if upstream is up to date
-
-* fg/exclude-bq (Tue Feb 10 15:20:17 2009 +0100) 1 commit
- - Support "\" in non-wildcard exclusion entries
-
-* fc/config-editor (Sat Feb 7 23:53:00 2009 +0200) 1 commit
- - config: Add new option to open an editor.
-
-* dm/add-i-edit-abort (Thu Feb 12 00:19:41 2009 -0500) 1 commit
- - add -i: revisit hunk on editor failure
-
-* tp/completion (Wed Feb 11 13:03:26 2009 -0500) 4 commits
- - completion: More fixes to prevent unbound variable errors
- - completion: Better __git_ps1 support when not in working directory
- - completion: Use consistent if [...] convention, not "test"
- - completion: For consistency, change "git rev-parse" to __gitdir
-   calls
-
-* js/branch-symref (Fri Feb 13 04:40:18 2009 -0500) 1 commit
- - builtin-branch: improve output when displaying remote branches
-
-* js/send-email (Sat Feb 14 23:32:15 2009 -0500) 3 commits
- - send-email: --suppress-cc improvements
- - send-email: handle multiple Cc addresses when reading mbox message
- - send-email: allow send-email to run outside a repo
-
-* al/ansi-color (Fri Feb 13 22:53:41 2009 +0100) 2 commits
- - builtin-branch.c: Rename branch category color names
- - Clean up use of ANSI color sequences
+* gb/gitweb-base (Sun Feb 15 10:18:36 2009 +0100) 1 commit
+ - gitweb: fix wrong base URL when non-root DirectoryIndex
 
-All of the above are probably ready for 'next'.
+Should this go in 1.6.2-rc2?
 
-* js/remote-set-head (Sat Feb 14 05:30:30 2009 -0500) 5 commits
- - builtin-remote: better handling of multiple remote HEADs
- - builtin-remote: add set-head subcommand
- - builtin-remote: teach show to display remote HEAD
- - builtin-remote: move duplicated cleanup code its own function
- - builtin-clone: move locate_head() to remote.c so it can be re-used
-
-* jk/head-lookup (Sun Feb 15 01:18:18 2009 -0500) 5 commits
- - remote: use exact HEAD lookup if it is available
- - remote: refactor guess_remote_head
- - refactor find_refs_by_name to accept const list
- - add basic http clone/fetch tests
- - test scripts: refactor start_httpd helper
+* tr/gcov (Sun Feb 15 23:25:45 2009 +0100) 8 commits
+ - Test git-patch-id
+ - Test rev-list --parents/--children
+ - Test log --decorate
+ - Test fsck a bit harder
+ - Test log --graph
+ - Test diff --dirstat functionality
+ - Test that diff can read from stdin
+ - Support coverage testing with GCC/gcov
 
-Builds on top of Jay Soffian's js/remote-set-head topic.
+* jc/add-p-unquote (Mon Feb 16 22:43:43 2009 -0800) 1 commit
+ - git-add -i/-p: learn to unwrap C-quoted paths
 
-* sg/rerere-cleanup (Sat Feb 14 23:21:04 2009 +0100) 1 commit
- - rerere: remove duplicated functions
+----------------------------------------------------------------
+[Stalled and may need help and prodding to go forward]
 
 * ns/stash-keep (Thu Feb 12 06:25:14 2009 +0900) 1 commit
  - stash: --keep option just saves
 
-* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
- - receive-pack: default receive.denyDeleteCurrent to refuse
-
-----------------------------------------------------------------
-[Stalled and may need help and prodding to go forward]
+Do we want to keep this one?
 
 * lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 1 commit
  - archive.c: add support for --submodules[=(all|checkedout)]
@@ -120,7 +67,8 @@ rev-parse to dig further.  The line number in the "previous" information
 may need refining, and sanity checking code for reference counting may
 need to be resurrected before this can move forward.
 
-Recent tig discussion may blow new life into it.  Let's see.
+I thought recent tig discussion may blow new life into it, but is this
+unneeded?  If so I'd rather revert it (or discard after 1.6.2).
 
 * db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
  - Support fetching from foreign VCSes
@@ -147,14 +95,15 @@ the other end is a native git repository is a very worthy goal.
 
 I think the code is much cleaner than the first round, but I am not
 convinced it is doing the right thing in the connectivity traverser.  
-I'd like to keep this out of 1.6.2.
+Independent review sorely needed.
 
 * sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
  - gitweb: Optional grouping of projects by category
  - gitweb: Split git_project_list_body in two functions
  - gitweb: Modularized git_get_project_description to be more generic
 
-Design discussion between Jakub and Sebastien seems to have stalled.
+Design discussion between Jakub and Sebastien seems to have stalled, but
+Jakub seems to be taking this over.
 
 * jc/fsck (Fri Jan 30 02:33:47 2009 -0800) 4 commits
  - fsck: three levels of validation
@@ -198,21 +147,63 @@ I'm giving a fresh start to J6t's series which contains this.
 I'm giving a fresh start to Lars's second iteration.
 
 ----------------------------------------------------------------
-[Actively cooking]
+[Will merge to 'next' soon]
+
+* js/send-email (Sat Feb 14 23:32:15 2009 -0500) 3 commits
+ - send-email: --suppress-cc improvements
+ - send-email: handle multiple Cc addresses when reading mbox message
+ - send-email: allow send-email to run outside a repo
+
+* sg/rerere-cleanup (Sat Feb 14 23:21:04 2009 +0100) 1 commit
+ - rerere: remove duplicated functions
+
+----------------------------------------------------------------
+[Ready for 'master' after 1.6.2]
+
+* jw/imap-preformatted-html (Thu Feb 12 08:58:12 2009 -0600) 1 commit
+ + imap.preformattedHTML to tell Thunderbird to send non-flowed text
+
+The patch text should be identical to Jeremy's "Virtual Patch", except
+that the configuration variable was renamed per list discussion.
+
+* jw/format-patch-attach (Thu Feb 12 09:51:55 2009 -0600) 1 commit
+ + Enable setting attach as the default in .gitconfig for git-format-
+   patch.
+
+* sr/force-rebase (Fri Feb 13 23:48:01 2009 +0100) 1 commit
+ + Teach rebase to rebase even if upstream is up to date
+
+* fg/exclude-bq (Tue Feb 10 15:20:17 2009 +0100) 1 commit
+ + Support "\" in non-wildcard exclusion entries
+
+* dm/add-i-edit-abort (Thu Feb 12 00:19:41 2009 -0500) 1 commit
+ + add -i: revisit hunk on editor failure
+
+* tp/completion (Wed Feb 11 13:03:26 2009 -0500) 4 commits
+ + completion: More fixes to prevent unbound variable errors
+ + completion: Better __git_ps1 support when not in working directory
+ + completion: Use consistent if [...] convention, not "test"
+ + completion: For consistency, change "git rev-parse" to __gitdir
+   calls
+
+* js/branch-symref (Fri Feb 13 04:40:18 2009 -0500) 1 commit
+ + builtin-branch: improve output when displaying remote branches
+
+* al/ansi-color (Fri Feb 13 22:53:41 2009 +0100) 2 commits
+ + builtin-branch.c: Rename branch category color names
+ + Clean up use of ANSI color sequences
 
 * kb/checkout-optim (Mon Feb 9 21:54:53 2009 +0100) 9 commits
- - lstat_cache(): print a warning if doing ping-pong between cache
+ + lstat_cache(): print a warning if doing ping-pong between cache
    types
- - show_patch_diff(): remove a call to fstat()
- - write_entry(): use fstat() instead of lstat() when file is open
- - write_entry(): cleanup of some duplicated code
- - create_directories(): remove some memcpy() and strchr() calls
- - unlink_entry(): introduce schedule_dir_for_removal()
- - lstat_cache(): swap func(length, string) into func(string, length)
- - lstat_cache(): generalise longest_match_lstat_cache()
- - lstat_cache(): small cleanup and optimisation
-
-Should be ready for 'next'.
+ + show_patch_diff(): remove a call to fstat()
+ + write_entry(): use fstat() instead of lstat() when file is open
+ + write_entry(): cleanup of some duplicated code
+ + create_directories(): remove some memcpy() and strchr() calls
+ + unlink_entry(): introduce schedule_dir_for_removal()
+ + lstat_cache(): swap func(length, string) into func(string, length)
+ + lstat_cache(): generalise longest_match_lstat_cache()
+ + lstat_cache(): small cleanup and optimisation
 
 * js/valgrind (Thu Feb 5 22:03:00 2009 +0100) 9 commits
  + valgrind: do not require valgrind 3.4.0 or newer
@@ -226,44 +217,63 @@ Should be ready for 'next'.
  + Add valgrind support in test scripts
 
 ----------------------------------------------------------------
-[Graduated to "master"]
-
-* jn/gitweb-committag (Fri Feb 6 10:12:41 2009 +0100) 1 commit
- + gitweb: Better regexp for SHA-1 committag match
-
-* js/maint-1.6.0-path-normalize (Sat Feb 7 16:08:31 2009 +0100) 5 commits
- + Remove unused normalize_absolute_path()
- + Test and fix normalize_path_copy()
- + Fix GIT_CEILING_DIRECTORIES on Windows
- + Move sanitary_path_copy() to path.c and rename it to
-   normalize_path_copy()
- + Make test-path-utils more robust against incorrect use
+[Actively cooking]
 
-Replaces one from René that was queued earlier.
+* js/notes (Sat Feb 14 21:23:25 2009 +0100) 13 commits
+ - notes: refuse to edit notes outside refs/notes/
+ - t3301: use test_must_fail instead of !
+ - t3301: fix confusing quoting in test for valid notes ref
+ - notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
+ - notes: only clean up message file when editing
+ - handle empty notes gracefully
+ + git notes show: test empty notes
+ + git-notes: fix printing of multi-line notes
+ + notes: fix core.notesRef documentation
+ + Add an expensive test for git-notes
+ + Speed up git notes lookup
+ + Add a script to edit/inspect notes
+ + Introduce commit notes
+
+Earlier part was merged to master and then reverted there.  I probably
+should rebase this after 1.6.2 to keep my sanity.
+
+* fc/config-editor (Tue Feb 17 02:54:54 2009 +0200) 9 commits
+ . config: Cleanup editor action.
+ . config: Codestyle cleanups.
+ . config: Don't allow extra arguments for -e or -l.
+ . config: Disallow multiple config file locations.
+ . config: Disallow multiple variable types.
+ . config: Use parseopt.
+ . config: Reorganize get_color*.
+ . config: Trivial rename in preparation for parseopt.
+ - config: Add new option to open an editor.
 
-* js/git-submodule-trailing-slash (Sat Feb 7 14:43:15 2009 +0100) 2 commits
- + submodule: warn about non-submodules
- + Let ls-files strip trailing slashes in submodules' paths
+The follow-up series does not pass the test suite, and evicted from 'pu';
+the first one might be 'next' worthy, though.
 
-* ms/mailmap (Thu Feb 8 15:34:31 2009 +0100) 5 commits
- + Move mailmap documentation into separate file
- + Change current mailmap usage to do matching on both name and email
-   of author/committer.
- + Add map_user() and clear_mailmap() to mailmap
- + Add find_insert_index, insert_at_index and clear_func functions to
-   string_list
- + Add log.mailmap as configurational option for mailmap location
+* js/remote-set-head (Sat Feb 14 05:30:30 2009 -0500) 5 commits
+ - builtin-remote: better handling of multiple remote HEADs
+ - builtin-remote: add set-head subcommand
+ - builtin-remote: teach show to display remote HEAD
+ - builtin-remote: move duplicated cleanup code its own function
+ - builtin-clone: move locate_head() to remote.c so it can be re-used
 
-* ff/submodule-no-fetch (Thu Feb 5 20:18:32 2009 -0200) 1 commit
- + submodule: add --no-fetch parameter to update command
+* jk/head-lookup (Sun Feb 15 01:18:18 2009 -0500) 5 commits
+ - remote: use exact HEAD lookup if it is available
+ - remote: refactor guess_remote_head
+ - refactor find_refs_by_name to accept const list
+ - add basic http clone/fetch tests
+ - test scripts: refactor start_httpd helper
 
-* mc/setup-cd-p (Fri Feb 6 19:24:28 2009 -0800) 1 commit
- + git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work
-   tree
+Builds on top of Jay Soffian's js/remote-set-head topic.  How well do
+these two work in practice in the real world?  Success stories?
 
 ----------------------------------------------------------------
 [On Hold]
 
+* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
+ - receive-pack: default receive.denyDeleteCurrent to refuse
+
 * jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
  - Refuse updating the current branch in a non-bare repository via
    push
@@ -276,7 +286,7 @@ This is for 1.7.0.
  - builtin-commit: shorten eye-sore overlong lines
  - Add "partial commit" tests during a conflicted merge
 
-This is only meant as a weatherballoon to help facilitate discussion.
+This was only meant as a weatherballoon to help facilitate discussion.
 
 * jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
  - git-merge-file: allow converting the results for the work tree
@@ -298,6 +308,8 @@ canonical representation and possibly add conflict markers, and then write
 the results out after convert_to_working_tree().  It also needs to write
 in binary mode as well.
 
+[Perhaps will discard]
+
 * jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
  . diff: enable "too large a rename" warning when -M/-C is explicitly
    asked for