What's cooking (2009/04 #02)

diff --git a/whats-cooking.txt b/whats-cooking.txt
index 5569e63251ebc32f2d53658081a185fed47e0494..0b8eaa374da8ede53e13f6429d32a67518b9d0e4 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 (Apr 2009, #01; Mon, 06)
-X-master-at: fbdc05661d9b732d06c47ccb3d5836d0d1b563e5
-X-next-at: 5efaefce91ae81a7490893cc6245a3f52998b522
+Subject: What's cooking in git.git (Apr 2009, #02; Sun, 12)
+X-master-at: c965c029330b1f81cc107c5d829e7fd79c61d8ea
+X-next-at: d07d5c8f15ddd1f2569e1778cb82501a201d2f22
 
-What's cooking in git.git (Apr 2009, #01; Mon, 06)
+What's cooking in git.git (Apr 2009, #02; Sun, 12)
 --------------------------------------------------
 
 Here are the topics that have been cooking.  Commits prefixed with '-' are
@@ -14,9 +14,78 @@ 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.
 
+We are at 1.6.3-rc0; the tip of 'master' might have some unexpected
+minor regressions, and I'd appreciate people to test and report so that we
+can keep this cycle short.
+
 ----------------------------------------------------------------
 [New Topics]
 
+* mm/add-p-quit (Fri Apr 10 16:57:01 2009 +0200) 1 commit
+ - [NEEDS SIGN OFF, DOC, AND REVIEW] git add -p: new "quit" command
+   at the prompt.
+
+I think this is Ok for 1.6.3, but some duplicated hunks bothered me.  I
+did not read the patch really seriously.
+
+* lt/bool-on-off (Thu Apr 9 12:40:39 2009 -0700) 1 commit
+ - Allow users to un-configure rename detection
+
+The commit log message needs to be cleaned up, the patch needs to be
+signed off, and there probably needs a documentation, but I think
+otherwise this is a good idea.
+
+* nd/archive-attribute (Thu Apr 9 17:01:30 2009 +1000) 2 commits
+ - archive: do not read .gitattributes in working directory
+ - attr: add GIT_ATTR_INDEX "direction"
+
+I think this is Ok for 1.6.3 but it needs new tests to protect the new
+feature from future breakages.
+
+* js/add-edit (Wed Apr 8 23:30:24 2009 +0200) 1 commit
+ - git-add: introduce --edit (to edit the diff vs. the index)
+
+I am Ok with the general idea, but the error detection needs to be more
+robust than merely relying on --recount.
+
+* eb/upload-archive-from-git-shell (Thu Apr 9 21:58:52 2009 +0200) 1 commit
+ - git-shell: Add 'git-upload-archive' to allowed commands.
+
+I think this is Ok for 1.6.3.
+
+* jc/shared-literally (Sun Apr 12 17:55:18 2009 -0700) 2 commits
+ - Mark t1301 permission test to depend on POSIXPERM
+ - t1301-shared-repo: fix forced modes test
+
+J6t's updates to fix permission tests and make sure they won't run on
+systems without permission bits on the filesystem.
+
+I think this is Ok for 1.6.3.
+
+* ns/am-to-empty (Fri Apr 10 09:34:42 2009 +0900) 1 commit
+ - git-am: teach git-am to apply a patch to an unborn branch
+
+I think this is Ok for 1.6.3.
+
+* bw/short-ref-strict (Sat Apr 11 22:35:18 2009 +0200) 2 commits
+ . for-each-ref: refname:short utilize core.warnAmbiguousRefs
+ . get_short_ref(): add strict mode
+
+This is an "obviously good thing to do" candidate for 1.6.3 but had
+serious conflicts with other topics I didn't feel like resolving myself;
+as the series is coming from TopGit, I'd ask the submitter to rebase it
+for me ;-)
+
+* lt/pack-object-memuse (Fri Apr 10 18:15:26 2009 -0700) 2 commits
+ - show_object(): push path_name() call further down
+ - process_{tree,blob}: show objects without buffering
+
+This had some conflicts with Christian's bisect topic; I think I resolved
+them correctly, but double-checking would be nice.
+
+----------------------------------------------------------------
+[Graduated to "master"]
+
 * mh/html-path (Sun Apr 5 04:15:16 2009 +0200) 1 commit
  + add --html-path to get the location of installed HTML docs
 
@@ -48,99 +117,39 @@ meant to be merged to the maintenance series have "maint-" in their names.
 These should go to 'master' soonish.
 
 * cc/sha1-bsearch (Mon Apr 6 00:48:49 2009 -0700) 3 commits
- - sha1-lookup: fix up the assertion message
- - patch-ids: use the new generic "sha1_pos" function to lookup sha1
- - sha1-lookup: add new "sha1_pos" function to efficiently lookup
+ + sha1-lookup: fix up the assertion message
+ + patch-ids: use the new generic "sha1_pos" function to lookup sha1
+ + sha1-lookup: add new "sha1_pos" function to efficiently lookup
    sha1
 
-I think this is Ok for 'next', but somebody might want to prove me wrong
-by running some benchmarks.
-
-----------------------------------------------------------------
-[Will Discard]
-
 * jc/name-branch-iffy (Sat Mar 21 14:30:21 2009 -0700) 1 commit
- - checkout -: make "-" to mean "previous branch" everywhere
+ + checkout -: make "-" to mean "previous branch" everywhere
 
-----------------------------------------------------------------
-[Graduated to "master"]
-
-* cj/doc-format (Fri Mar 27 00:36:47 2009 -0700) 11 commits
- + Merge branch 'cj/doc-quiet' into cj/doc-format
- + Documentation: option to render literal text as bold for manpages
- + Documentation: asciidoc.conf: fix verse block with block titles
- + Documentation: asciidoc.conf: always use <literallayout> for
-   [blocktext]
- + Documentation: move "spurious .sp" code into manpage-base.xsl
- + Documentation: move quieting params into manpage-base.xsl
- + Documentation: rename docbook-xsl-172 attribute to git-asciidoc-
-   no-roff
- + Documentation: use parametrized manpage-base.xsl with manpage-
-   {1.72,normal}.xsl
- + Documentation: move callouts.xsl to manpage-{base,normal}.xsl
- + Documentation/Makefile: break up texi pipeline
- + Documentation/Makefile: make most operations "quiet"
-
-* cj/doc-quiet (Fri Mar 27 01:49:39 2009 -0500) 2 commits
- + Documentation/Makefile: break up texi pipeline
- + Documentation/Makefile: make most operations "quiet"
-
-* jc/name-branch (Sat Mar 21 14:35:51 2009 -0700) 5 commits
- + strbuf_check_branch_ref(): a helper to check a refname for a
-   branch
- + Fix branch -m @{-1} newname
- + check-ref-format --branch: give Porcelain a way to grok branch
-   shorthand
- + strbuf_branchname(): a wrapper for branch name shorthands
- + Rename interpret/substitute nth_last_branch functions
-
-* sb/format-patch-patchname (Fri Mar 27 01:13:01 2009 +0100) 7 commits
- + log-tree: fix patch filename computation in "git format-patch"
- + format-patch: --numbered-files and --stdout aren't mutually
-   exclusive
- + format-patch: --attach/inline uses filename instead of SHA1
- + format-patch: move get_patch_filename() into log-tree
- + format-patch: pass a commit to reopen_stdout()
- + format-patch: construct patch filename in one function
- + pretty.c: add %f format specifier to format_commit_message()
-
-* mg/tracked-local-branches (Thu Mar 26 21:53:25 2009 +0100) 2 commits
- + Make local branches behave like remote branches when --tracked
- + Test for local branches being followed with --track
-
-* jc/shared-literally (Fri Mar 27 23:21:00 2009 -0700) 4 commits
- + set_shared_perm(): sometimes we know what the final mode bits
-   should look like
- + move_temp_to_file(): do not forget to chmod() in "Coda hack"
-   codepath
- + Move chmod(foo, 0444) into move_temp_to_file()
- + "core.sharedrepository = 0mode" should set, not loosen
-
-* tr/maint-1.6.1-doc-format-patch--root (Thu Mar 26 18:29:25 2009 +0100) 1 commit
- + Documentation: format-patch --root clarifications
-
-* mh/format-patch-add-header (Thu Mar 26 10:51:05 2009 -0600) 1 commit
- + format-patch: add arbitrary email headers
-
-* ef/fast-export (Mon Mar 23 12:53:09 2009 +0000) 4 commits
- + builtin-fast-export.c: handle nested tags
- + builtin-fast-export.c: fix crash on tagged trees
- + builtin-fast-export.c: turn error into warning
- + test-suite: adding a test for fast-export with tag variants
-
-* kb/tracking-count-no-merges (Wed Mar 4 18:47:39 2009 +0100) 1 commit
- + stat_tracking_info(): only count real commits
-
-* jc/maint-1.6.0-keep-pack (Sat Mar 21 17:26:11 2009 -0500) 6 commits
- + pack-objects: don't loosen objects available in alternate or kept
-   packs
- + t7700: demonstrate repack flaw which may loosen objects
-   unnecessarily
- + Remove --kept-pack-only option and associated infrastructure
- + pack-objects: only repack or loosen objects residing in "local"
-   packs
- + git-repack.sh: don't use --kept-pack-only option to pack-objects
- + t7700-repack: add two new tests demonstrating repacking flaws
+* cc/bisect-filter (Mon Mar 30 06:59:59 2009 +0200) 19 commits
+ + bisect--helper: string output variables together with "&&"
+ + rev-list: pass "int flags" as last argument of "show_bisect_vars"
+ + t6030: test bisecting with paths
+ + bisect: use "bisect--helper" and remove "filter_skipped" function
+ + bisect: implement "read_bisect_paths" to read paths in
+   "$GIT_DIR/BISECT_NAMES"
+ + bisect--helper: implement "git bisect--helper"
+ + bisect: use the new generic "sha1_pos" function to lookup sha1
+ + rev-list: call new "filter_skip" function
+ + Merge branch 'cc/sha1-bsearch' into HEAD
+ + patch-ids: use the new generic "sha1_pos" function to lookup sha1
+ + sha1-lookup: add new "sha1_pos" function to efficiently lookup
+   sha1
+ + rev-list: pass "revs" to "show_bisect_vars"
+ + rev-list: make "show_bisect_vars" non static
+ + rev-list: move code to show bisect vars into its own function
+ + rev-list: move bisect related code into its own file
+ + rev-list: make "bisect_list" variable local to "cmd_rev_list"
+ + refs: add "for_each_ref_in" function to refactor "for_each_*_ref"
+   functions
+ + quote: add "sq_dequote_to_argv" to put unwrapped args in an argv
+   array
+ + quote: implement "sq_dequote_many" to unwrap many args in one
+   string
 
 ----------------------------------------------------------------
 [Stalled and may need help and prodding to go forward]
@@ -158,12 +167,6 @@ The one I posted had a few corner-case bugs that was caught with the test
 suite; this one has them fixed.  People did not like the UI so it is kept
 out of 'next'
 
-* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 1 commit
- - archive.c: add support for --submodules[=(all|checkedout)]
-
-Discussion stalled on the submodule selection criteria.
-Probably I should discard it and wait for a reroll if needed.
-
 * jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
  - git-merge-file: allow converting the results for the work tree
 
@@ -184,10 +187,10 @@ 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.
 
-* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
- - Support fetching from foreign VCSes
- - Add specification of git-vcs helpers
- - Add "vcs" config option in remotes
+* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits
+ - Add option for using a foreign VCS
+ - Document details of transport function APIs
+ - Allow late reporting of fetched hashes
 
 * js/notes (Wed Feb 18 11:17:27 2009 -0800) 14 commits
  - tests: fix "export var=val"
@@ -223,66 +226,27 @@ to resolve issues these tests identify.
 ----------------------------------------------------------------
 [Actively cooking]
 
-* da/difftool (Sat Apr 4 21:00:24 2009 -0700) 25 commits
- - mergetool--lib: add new merge tool TortoiseMerge
- - mergetool--lib: make (g)vimdiff workable under Windows
- - mergetool--lib: consolidate the last redundant bits in
-   {diff,merge}tool
- - mergetool-lib: specialize opendiff options when in diff mode
- - mergetool-lib: refactor run_mergetool and check_unchanged
- - bash completion: add git-difftool
- - {diff,merge}tool: rename helpers to remove them from tab-
-   completion
- - mergetool-lib: add diffuse as merge and diff tool
- - mergetool-lib: specialize xxdiff options when in diff mode
- - mergetool-lib: specialize kdiff3 options when in diff mode
- - mergetool: use run_mergetool from git-mergetool-lib
- - difftool: use run_mergetool from git-mergetool-lib
- - mergetool-lib: introduce run_mergetool
- - difftool: use valid_tool from git-mergetool-lib
- - mergetool: use valid_tool from git-mergetool-lib
- - difftool: use get_mergetool_path from git-mergetool-lib
- - mergetool: use get_mergetool_path from git-mergetool-lib
- - Add a mergetool-lib scriptlet for holding common merge tool
-   functions
+* da/difftool (Sat Apr 11 20:41:56 2009 -0700) 16 commits
+ - mergetool--lib: simplify API usage by removing more global
+   variables
+ - Fix misspelled mergetool.keepBackup
+ - difftool/mergetool: refactor commands to use git-mergetool--lib
  - mergetool: use $( ... ) instead of `backticks`
+ - bash completion: add git-difftool
  - difftool: add support for a difftool.prompt config variable
+ - difftool: add various git-difftool tests
+ - difftool: move 'git-difftool' out of contrib
+ - difftool/mergetool: add diffuse as merge and diff tool
  - difftool: add a -y shortcut for --no-prompt
  - difftool: use perl built-ins when testing for msys
- - difftool: add various git-difftool tests
- - difftool: add git-difftool to the list of commands
- + difftool: move 'git-difftool' out of contrib
-
-* cc/bisect-filter (Mon Mar 30 06:59:59 2009 +0200) 19 commits
- - bisect--helper: string output variables together with "&&"
- - rev-list: pass "int flags" as last argument of "show_bisect_vars"
- - t6030: test bisecting with paths
- - bisect: use "bisect--helper" and remove "filter_skipped" function
- - bisect: implement "read_bisect_paths" to read paths in
-   "$GIT_DIR/BISECT_NAMES"
- - bisect--helper: implement "git bisect--helper"
- - bisect: use the new generic "sha1_pos" function to lookup sha1
- - rev-list: call new "filter_skip" function
- - Merge branch 'cc/sha1-bsearch' into HEAD
- - patch-ids: use the new generic "sha1_pos" function to lookup sha1
- - sha1-lookup: add new "sha1_pos" function to efficiently lookup
-   sha1
- + rev-list: pass "revs" to "show_bisect_vars"
- + rev-list: make "show_bisect_vars" non static
- + rev-list: move code to show bisect vars into its own function
- + rev-list: move bisect related code into its own file
- + rev-list: make "bisect_list" variable local to "cmd_rev_list"
- + refs: add "for_each_ref_in" function to refactor "for_each_*_ref"
-   functions
- + quote: add "sq_dequote_to_argv" to put unwrapped args in an argv
-   array
- + quote: implement "sq_dequote_many" to unwrap many args in one
-   string
-
-Re-rolled and made earlier parts ready for 'master'.  I think we should
-move this to 'next' soonish and aim to have it in 1.6.3
-
-* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 13 commits
+ - difftool: remove the backup file feature
+ - difftool: remove merge options for opendiff, tkdiff, kdiff3 and
+   xxdiff
+ - git-mergetool: add new merge tool TortoiseMerge
+ - git-mergetool/difftool: make (g)vimdiff workable under Windows
+ - doc/merge-config: list ecmerge as a built-in merge tool
+
+* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
  - builtin-replace: use "usage_msg_opt" to give better error messages
  - parse-options: add new function "usage_msg_opt"
  - builtin-replace: teach "git replace" to actually replace
@@ -295,11 +259,9 @@ move this to 'next' soonish and aim to have it in 1.6.3
  - replace_object: add mechanism to replace objects found in
    "refs/replace/"
  - refs: add a "for_each_replace_ref" function
- - patch-ids: use the new generic "sha1_pos" function to lookup sha1
- - sha1-lookup: add new "sha1_pos" function to efficiently lookup
-   sha1
 
-Re-rolled based on the updated binary search API.
+I suspect an attempt to replace an object that is directly listed on the
+command line would not work very well with this series.
 
 ----------------------------------------------------------------
 [On Hold]