What's cooking (2008/12 #02)

diff --git a/whats-cooking.txt b/whats-cooking.txt
index 39bddb4a0e5683adb9b3ad91b866d871a39b65e0..206d171da4e169fe65b8f5697807c41981e94275 100644 (file)
--- a/whats-cooking.txt
+++ b/whats-cooking.txt
@@ -1,8 +1,10 @@
-Subject: What's cooking in git.git (Dec 2008, #01; Tue, 02)
-X-master-at: 757c7f60a78004fc3d0ea62f44320d54ef430c10
-X-next-at: 44b0c4a7f55234e12cead3e1909c17be7c068dca
+To: git@vger.kernel.org
+Subject: What's cooking in git.git (Dec 2008, #02; Sun, 14)
+bcc: William Pursell <bill.pursell@gmail.com>, Theodore Tso <tytso@mit.edu>
+X-master-at: 7e76aba317b690932c8236311219b0faf97f1571
+X-next-at: eb2f0c452e2cf87efa16cc9ace8587e198d60eb0
 
-What's cooking in git.git (Dec 2008, #01; Tue, 02)
+What's cooking in git.git (Dec 2008, #02; Sun, 14)
 --------------------------------------------------
 
 Here are the topics that have been cooking.  Commits prefixed
@@ -12,125 +14,94 @@ in 'next'.
 The topics list the commits in reverse chronological order.  The topics
 meant to be merged to the maintenance series have "maint-" in their names.
 
-As we have already passed -rc1, things queued in 'next' let alone 'pu' are
+As we have already passed -rc2, things queued in 'next' let alone 'pu' are
 unlikely to be merged to 'master' by the end of year unless otherwise
 noted.
 
 ----------------------------------------------------------------
 [New Topics]
 
-* gb/gitweb-patch (Sat Nov 29 14:41:11 2008 +0100) 2 commits
- - [DONTMERGE: wait for signoff] gitweb: links to patch action in
-   commitdiff and shortlog view
- - gitweb: add patch view
+* wp/add-p-goto (Thu Dec 4 10:22:40 2008 +0000) 2 commits
+ + Add 'g' command to go to a hunk
+ + Add subroutine to display one-line summary of hunks
 
-* lt/reset-merge (Mon Dec 1 09:30:31 2008 -0800) 1 commit
- + Add 'merge' mode to 'git reset'
+* jn/gitweb-blame (Thu Dec 11 01:33:29 2008 +0100) 3 commits
+ - gitweb: cache $parent_commit info in git_blame()
+ - gitweb: A bit of code cleanup in git_blame()
+ - gitweb: Move 'lineno' id from link to row element in git_blame
 
-Unfortunately, I cannot write down a good use case in what circumstances
-this is needed, even though I do recall that I occasionally (perhaps once
-every two months) needed to do "read-tree -m -u" myself in the past, and
-this patch brings that feature close to Porcelain.  On the other hand, the
-existing "reset --mixed" is very easily explained ("after starting to add
-changes to the staging area, you realized that you screwed up, and you
-want to redo it from scratch").  Therefore, I cannot justify what the log
-message of this change claims myself.
+I've briefly looked at the resurrection of Ajaxy blame that comes on top
+of this series and it looked promising.
 
-* jc/rm-i-t-a (Fri Nov 28 19:56:34 2008 -0800) 5 commits
- + git add --intent-to-add: do not let an empty blob be committed by
-   accident
- + git add --intent-to-add: fix removal of cached emptiness
- + builtin-rm.c: explain and clarify the "local change" logic
- + Merge branch 'nd/narrow' (early part) into jc/add-i-t-a
- + Extend index to save more flags
+* mv/um-pdf (Wed Dec 10 23:44:50 2008 +0100) 1 commit
+ - Add support for a pdf version of the user manual
 
-As intent-to-add index entry is a new feature for 1.6.1, it probably is a
-good idea to merge this to 'master'.  Nitpicks and bugfixes are very much
-appreciated.
-
-* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
- - In add --patch, Handle K,k,J,j slightly more gracefully.
- - Add / command in add --patch
- - git-add -i/-p: Change prompt separater from slash to comma
-
-There are some other useful bits and pieces around this area exchanged on
-the list with the author of these patches.  I think it would become a
-useful series after reassembling their pieces.  Waiting for v2.
+I do not have a new enough combination of dblatex and asciidoc myself but
+this would help interested people.
 
-* jn/gitweb-utf8 (Mon Dec 1 19:01:42 2008 +0100) 1 commit
- - gitweb: Fix handling of non-ASCII characters in inserted HTML
-   files.
+* np/auto-thread (Sat Dec 13 15:06:40 2008 -0500) 2 commits
+ + pack-objects: don't use too many threads with few objects
+ + autodetect number of CPUs by default when using threads
 
-Possibly a bugfix worthy to have in 1.6.1.
-
-* jc/clone-symref-2 (Sat Nov 29 23:38:21 2008 -0800) 7 commits
- - clone: test the new HEAD detection logic
- - Merge commit 'HEAD@{2}' into HEAD
- - upload-pack: send the HEAD information
- - clone: find the current branch more explicitly
- - connect.c::read_extra_info(): find where HEAD points at
- - connect.c::read_extra_info(): prepare to receive more than server
-   capabilities
- - get_remote_heads(): refactor code to read "server capabilities"
-
-This is no way meant for 1.6.1, let alone next, yet.
+* 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
 
 ----------------------------------------------------------------
-[Graduated to "master"]
+[Post 1.6.1 items]
 
-* cr/remote-update-v (Tue Nov 18 19:04:02 2008 +0800) 1 commit
- + git-remote: add verbose mode to git remote update
+* gb/gitweb-patch (Sat Dec 6 16:02:35 2008 +0100) 3 commits
+ - gitweb: link to patch(es) view from commit and log views
+ - gitweb: add patches view
+ - gitweb: add patch view
 
-* rs/strbuf-expand (Sun Nov 23 00:16:59 2008 +0100) 6 commits
- + remove the unused files interpolate.c and interpolate.h
- + daemon: deglobalize variable 'directory'
- + daemon: inline fill_in_extra_table_entries()
- + daemon: use strbuf_expand() instead of interpolate()
- + merge-recursive: use strbuf_expand() instead of interpolate()
- + add strbuf_expand_dict_cb(), a helper for simple cases
+Updated series.  Reviews and Acks?
 
-* mv/fast-export (Sun Nov 23 12:55:54 2008 +0100) 2 commits
- + fast-export: use an unsorted string list for extra_refs
- + Add new testcase to show fast-export does not always exports all
-   tags
+* lt/reset-merge (Wed Dec 3 18:00:12 2008 -0800) 2 commits
+ + Document "git-reset --merge"
+ + Add 'merge' mode to 'git reset'
 
-* st/levenshtein (Thu Nov 20 14:27:27 2008 +0100) 2 commits
- + Document levenshtein.c
- + Fix deletion of last character in levenshtein distance
+With updated documents.
 
-* js/mingw-rename-fix (Wed Nov 19 17:25:27 2008 +0100) 1 commit
- + compat/mingw.c: Teach mingw_rename() to replace read-only files
+* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
+ . In add --patch, Handle K,k,J,j slightly more gracefully.
+ . Add / command in add --patch
+ . git-add -i/-p: Change prompt separater from slash to comma
 
-* mv/clone-strbuf (Fri Nov 21 01:45:01 2008 +0100) 3 commits
- + builtin_clone: use strbuf in cmd_clone()
- + builtin-clone: use strbuf in clone_local() and
-   copy_or_link_directory()
- + builtin-clone: use strbuf in guess_dir_name()
+I am still holding onto this earlier topic to add '/' subcommand to allow
+finding a hunk with given text, but I'd rather not merge/rebase it on top
+of wp/add-p-goto series myself.  Waiting for a reroll.
 
-* pw/maint-p4 (Wed Nov 26 13:52:15 2008 -0500) 1 commit
- - git-p4: fix keyword-expansion regex
+* cb/mergetool (Fri Dec 12 21:48:41 2008 +0000) 4 commits
+ - mergetool: Don't keep temporary merge files unless told to
+ - mergetool: Add prompt to continue after failing to merge a file
+ - Add -y/--no-prompt option to mergetool
+ - Fix some tab/space inconsistencies in git-mergetool.sh
 
-* cc/bisect-skip (Sun Nov 23 22:02:49 2008 +0100) 1 commit
- - bisect: teach "skip" to accept special arguments like "A..B"
+Updated series.  Waiting for comments from the original author (Ted) and
+other interested parties.
 
-Should be in 1.6.1-rc1.
+----------------------------------------------------------------
+[Graduated to "master"]
 
-* lt/preload-lstat (Mon Nov 17 09:01:20 2008 -0800) 2 commits
- + Fix index preloading for racy dirty case
- + Add cache preload facility
+* jc/rm-i-t-a (Fri Nov 28 19:56:34 2008 -0800) 5 commits
+ + git add --intent-to-add: do not let an empty blob be committed by
+   accident
+ + git add --intent-to-add: fix removal of cached emptiness
+ + builtin-rm.c: explain and clarify the "local change" logic
+ + Merge branch 'nd/narrow' (early part) into jc/add-i-t-a
+ + Extend index to save more flags
 
-* ta/quiet-pull (Mon Nov 17 23:09:30 2008 +0100) 2 commits
- + Retain multiple -q/-v occurrences in git pull
- + Teach/Fix pull/fetch -q/-v options
+As intent-to-add index entry is a new feature for 1.6.1, it probably is a
+good idea to merge this to 'master'.  Nitpicks and bugfixes are very much
+appreciated.
 
-* ph/send-email (Tue Nov 11 00:54:02 2008 +0100) 4 commits
- + git send-email: ask less questions when --compose is used.
- + git send-email: add --annotate option
- + git send-email: interpret unknown files as revision lists
- + git send-email: make the message file name more specific.
+* jn/gitweb-utf8 (Mon Dec 1 19:01:42 2008 +0100) 1 commit
+ + gitweb: Fix handling of non-ASCII characters in inserted HTML
+   files.
 
-After merging these to 'master' I found a breakage which I hopefully
-fixed.
+A bugfix.
 
 ----------------------------------------------------------------
 [Will merge to "master" soon]
@@ -140,14 +111,6 @@ What are you looking for?  We are in -rc ;-)
 ----------------------------------------------------------------
 [On Hold]
 
-* cb/mergetool (Thu Nov 13 12:41:15 2008 +0000) 3 commits
- - [DONTMERGE] Add -k/--keep-going option to mergetool
- - Add -y/--no-prompt option to mergetool
- - Fix some tab/space inconsistencies in git-mergetool.sh
-
-Jeff had good comments on the last one; the discussion needs concluded,
-and also waiting for comments from the original author (Ted).
-
 * jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
  + blame: show "previous" information in --porcelain/--incremental
    format
@@ -198,7 +161,7 @@ fetch and push should use the real ancestry information recorded in the
 underlying objects, while rev-list, log, etc. should always use the
 replaced objects).  I have a suspicion that even cat-file could honor it.
 
-* nd/narrow (Sun Nov 30 17:54:38 2008 +0700) 18 commits
+* nd/narrow (Sun Nov 30 17:54:38 2008 +0700) 17 commits
  - wt-status: show sparse checkout info
  - Introduce default sparse patterns (core.defaultsparse)
  - checkout: add new options to support sparse checkout
@@ -218,9 +181,22 @@ replaced objects).  I have a suspicion that even cat-file could honor it.
  + update-index: refactor mark_valid() in preparation for new options
  + ls-files: add options to support sparse checkout
  + Introduce CE_NO_CHECKOUT bit
- + Extend index to save more flags
 
-Kicked back to 'on hold' until 1.6.1 final by popular(?) demand.
+Kicked back to 'on hold' until 1.6.1 final by popular demand; will be
+dropped from 'next' (see recent discussion on the interaction between the
+checkout area and commands such as "grep").
+
+* jc/clone-symref-2 (Sat Nov 29 23:38:21 2008 -0800) 7 commits
+ - clone: test the new HEAD detection logic
+ - Merge commit 'HEAD@{2}' into HEAD
+ - upload-pack: send the HEAD information
+ - clone: find the current branch more explicitly
+ - connect.c::read_extra_info(): find where HEAD points at
+ - connect.c::read_extra_info(): prepare to receive more than server
+   capabilities
+ - get_remote_heads(): refactor code to read "server capabilities"
+
+This is no way meant for 1.6.1, let alone next, yet.
 
 * jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
  - "git push": tellme-more protocol extension