What's cooking (2009/01 #07)

diff --git a/whats-cooking.txt b/whats-cooking.txt
index 9a54eddcf3d1e0c6082bc9906880e9394fcae82f..7d0e21d206efe6a82f80868821181cb9be32bb5e 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 (Jan 2009, #06; Sat, 24)
-X-master-at: 5dc1308562ab5991ecada68b06707709bea408c9
-X-next-at: 7298c8d081d90e4a3c5161414c17908750ecf5a9
+Subject: What's cooking in git.git (Jan 2009, #07; Wed, 28)
+X-master-at: 8712b3cdb0495f5a56b91cd67e2697412447a886
+X-next-at: c2891ee32a7e8274426c22439ed8d536a5b0bb43
 
-What's cooking in git.git (Jan 2009, #06; Sat, 24)
+What's cooking in git.git (Jan 2009, #07; Wed, 28)
 --------------------------------------------------
 
 Here are the topics that have been cooking.  Commits prefixed with '-' are
@@ -17,37 +17,80 @@ meant to be merged to the maintenance series have "maint-" in their names.
 ----------------------------------------------------------------
 [New Topics]
 
-* jg/mergetool (Sat Jan 24 00:12:45 2009 +0100) 1 commit
- - [wait for an ack from ted] mergetool: Don't repeat merge tool
-   candidates
+* jc/maint-1.6.0-split-diff-metainfo (Mon Jan 26 00:08:24 2009 -0800) 1 commit
+ + diff.c: output correct index lines for a split diff
 
-* cb/mergetool (Wed Jan 21 22:57:48 2009 +0000) 1 commit
- - [wait for ack from ted] mergetool: respect autocrlf by using
-   checkout-index
+This is slated for maintenance series 1.6.0.X, 1.6.1.X and also for
+'master'.  I think the change is pretty safe and sane to go directly to
+'master' but I had too many other topoics to look at that I did not feel
+comfortable enough to do so.
 
-* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits
- - git commit: pathspec without -i/-o implies -i semantics during a
-   merge
- - builtin-commit: shorten eye-sore overlong lines
- - Add "partial commit" tests during a conflicted merge
+* jc/maint-split-diff-metainfo (Tue Jan 27 01:08:02 2009 -0800) 2 commits
+ + Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-
+   split-diff-metainfo
+ + diff.c: output correct index lines for a split diff
 
-This is only meant as a weatherballoon to help facilitate discussion.
+Early conflict resolution branch for the above to carry it to 1.6.1X
+series.
 
-* sr/clone-empty (Fri Jan 23 01:07:32 2009 +0100) 1 commit
- + Allow cloning an empty repository
+* js/maint-rebase-i-submodule (Tue Jan 27 12:42:31 2009 +0100) 2 commits
+ + Fix submodule squashing into unrelated commit
+ + rebase -i squashes submodule changes into unrelated commit
 
-At last ;-)  This is a reasonable thing to do, and should be fast tracked
-to 'master'.
+* jg/tag-contains (Mon Jan 26 09:13:25 2009 -0500) 3 commits
+ + git-tag: Add --contains option
+ + Make has_commit() non-static
+ + Make opt_parse_with_commit() non-static
 
-* cc/replace (Fri Jan 23 10:07:46 2009 +0100) 7 commits
- - environment: add global variable to disable replacement
- - mktag: call "check_sha1_signature" with the replacement sha1
- - replace_object: add a test case
- - object: call "check_sha1_signature" with the replacement sha1
- - sha1_file: add a "read_sha1_file_repl" function
- - replace_object: add mechanism to replace objects found in
-   "refs/replace/"
- - refs: add a "for_each_replace_ref" function
+* jk/maint-cleanup-after-exec-failure (Wed Jan 28 02:38:14 2009 -0500) 4 commits
+ + git: use run_command() to execute dashed externals
+ + run_command(): help callers distinguish errors
+ + run_command(): handle missing command errors more gracefully
+ + git: s/run_command/run_builtin/
+
+* jc/maint-allow-uninteresting-missing (Tue Jan 27 23:19:30 2009 -0800) 1 commit
+ + revision traversal: allow UNINTERESTING objects to be missing
+
+This is a small follow-up to the fix to send-pack in 1.6.1; meant to go in
+1.6.1.X maintenance series and newer.
+
+* am/maint-push-doc (Mon Jan 26 00:45:33 2009 +0100) 3 commits
+ + Documentation: rework src/dst description in git push
+ + Documentation: more git push examples
+ + Documentation: simplify refspec format description
+
+* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
+ - git-merge-file: allow converting the results for the work tree
+
+We did not give scripted Porcelains a way to say "this temporary file I am
+using for merging is for this path, so use the core.autocrlf and attributes
+rules for that final path".  Instead, merge-file simply wrote out the
+data in the canonical repository representation.
+
+rerere has the same issue, but it is a lot worse.  It reads the three
+files (preimage, postimage and thisimage) from the work tree in the work
+tree representation, merges them without converting them to the canonical
+representation first but inserts the conflict markers with the canonical
+representation and writes the resulting mess out.  It needs to be fixed to
+read with convert_to_git(), merge them while they are still in the
+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.
+
+* jc/maint-add-u-remove-conflicted (Wed Jan 28 14:24:53 2009 -0800) 1 commit
+ - add -u: do not fail to resolve a path as deleted
+
+This has been updated from the posted version with a correction.
+
+* ns/am-slacker (Sat Jan 24 10:18:02 2009 +0900) 2 commits
+ + git-am: Add --ignore-date option
+ + am: Add --committer-date-is-author-date option
+
+It is a (probably) useful new feature with a sort-of cute explanation.
+
+* jc/maint-apply-fix (Sun Jan 25 23:41:26 2009 -0800) 1 commit
+ + builtin-apply.c: do not set bogus mode in check_preimage() for
+   deleted path
 
 ----------------------------------------------------------------
 [Stalled and may need help and prodding to go forward]
@@ -72,6 +115,26 @@ The "spec" did not seem quite well cooked yet, but in the longer term I
 think something like this to allow interoperating with other SCMs as if
 the other end is a native git repository is a very worthy goal.
 
+* cc/replace (Fri Jan 23 10:07:46 2009 +0100) 7 commits
+ - environment: add global variable to disable replacement
+ - mktag: call "check_sha1_signature" with the replacement sha1
+ - replace_object: add a test case
+ - object: call "check_sha1_signature" with the replacement sha1
+ - sha1_file: add a "read_sha1_file_repl" function
+ - replace_object: add mechanism to replace objects found in
+   "refs/replace/"
+ - refs: add a "for_each_replace_ref" function
+
+Nobody has review comments on this yet.
+
+* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 6 commits
+ - archive.c: add support for --submodules[=(all|checkedout)]
+ - tree.c: allow read_tree_recursive() to traverse gitlink entries
+ + Revert round #1 of the series
+ + builtin-ls-tree: enable traversal of submodules
+ + archive.c: enable traversal of submodules
+ + tree.c: add support for traversal of submodules
+
 ----------------------------------------------------------------
 [Reverted]
 
@@ -89,50 +152,17 @@ This broke git-format-patch badly.
  - valgrind: ignore ldso errors
  - Add valgrind support in test scripts
 
-Dscho seems to have some updates out of discussion with Peff, which is not
-queued here.
-
-* sp/runtime-prefix (Sun Jan 18 13:00:15 2009 +0100) 7 commits
- - Windows: Revert to default paths and convert them by
-   RUNTIME_PREFIX
- - Compute prefix at runtime if RUNTIME_PREFIX is set
- - Modify setup_path() to only add git_exec_path() to PATH
- - Add calls to git_extract_argv0_path() in programs that call
-   git_config_*
- - git_extract_argv0_path(): Move check for valid argv0 from caller
-   to callee
- - Refactor git_set_argv0_path() to git_extract_argv0_path()
- - Move computation of absolute paths from Makefile to runtime (in
-   preparation for RUNTIME_PREFIX)
-
-We should move this to 'next' soon with J6t's blessing.
-
-* lh/submodule-tree-traversal (Mon Jan 12 00:45:55 2009 +0100) 3 commits
- + builtin-ls-tree: enable traversal of submodules
- + archive.c: enable traversal of submodules
- + tree.c: add support for traversal of submodules
-
-There were a few updates posted, which I haven't picked up.
-
-* jk/signal-cleanup (Thu Jan 22 01:03:28 2009 -0500) 5 commits
- - pager: do wait_for_pager on signal death
- - refactor signal handling for cleanup functions
- - chain kill signals for cleanup functions
- - diff: refactor tempfile cleanup handling
- - Windows: Fix signal numbers
-
-Ready for 'next', but not tonight (yet).
+Dscho and Peff had further exchanges on the list; I am sort of waiting for
+the conclusion before picking any intermediate version up.
 
-* ks/maint-mailinfo-folded (Tue Jan 13 01:21:04 2009 +0300) 5 commits
- - mailinfo: tests for RFC2047 examples
- - mailinfo: add explicit test for mails like '<a.u.thor@example.com>
+* ks/maint-mailinfo-folded (Tue Jan 13 01:21:04 2009 +0300) 4 commits
+ + mailinfo: tests for RFC2047 examples
+ + mailinfo: add explicit test for mails like '<a.u.thor@example.com>
    (A U Thor)'
- - mailinfo: more smarter removal of rfc822 comments from 'From'
  + mailinfo: 'From:' header should be unfold as well
  + mailinfo: correctly handle multiline 'Subject:' header
 
-As far as I can see, the only remaining thing is a minor fix-up in the
-"comment removal" one before we can move this fully to 'next'.
+I just got tired of waiting and cleaned up the series myself.
 
 * js/notes (Tue Jan 13 20:57:16 2009 +0100) 6 commits
  + git-notes: fix printing of multi-line notes
@@ -156,13 +186,11 @@ Design discussion between Jakub and Sebastien continues.
 ----------------------------------------------------------------
 [Graduated to "master"]
 
-* js/patience-diff (Thu Jan 1 17:39:37 2009 +0100) 3 commits
- + bash completions: Add the --patience option
- + Introduce the diff option '--patience'
- + Implement the patience diff algorithm
+* sr/clone-empty (Fri Jan 23 01:07:32 2009 +0100) 1 commit
+ + Allow cloning an empty repository
 
-----------------------------------------------------------------
-[Will merge to "master" soon]
+Has anybody actually tried this and made sure the resulting empty clone
+works fine after the clone source gets updated with some contents?
 
 * kb/lstat-cache (Sun Jan 18 16:14:54 2009 +0100) 5 commits
  + lstat_cache(): introduce clear_lstat_cache() function
@@ -205,9 +233,48 @@ Design discussion between Jakub and Sebastien continues.
  + Add color_fwrite_lines(), a function coloring each line
    individually
 
+----------------------------------------------------------------
+[Will merge to "master" soon]
+
+* jg/mergetool (Sat Jan 24 00:12:45 2009 +0100) 1 commit
+ + mergetool: Don't repeat merge tool candidates
+
+* cb/mergetool (Wed Jan 21 22:57:48 2009 +0000) 1 commit
+ + mergetool: respect autocrlf by using checkout-index
+
+Now Ted told us not to wait for him, we'll go ahead by ourselves ;-).
+
+* jk/signal-cleanup (Thu Jan 22 01:03:28 2009 -0500) 5 commits
+ + pager: do wait_for_pager on signal death
+ + refactor signal handling for cleanup functions
+ + chain kill signals for cleanup functions
+ + diff: refactor tempfile cleanup handling
+ + Windows: Fix signal numbers
+
+* sp/runtime-prefix (Sun Jan 18 13:00:15 2009 +0100) 7 commits
+ + Windows: Revert to default paths and convert them by
+   RUNTIME_PREFIX
+ + Compute prefix at runtime if RUNTIME_PREFIX is set
+ + Modify setup_path() to only add git_exec_path() to PATH
+ + Add calls to git_extract_argv0_path() in programs that call
+   git_config_*
+ + git_extract_argv0_path(): Move check for valid argv0 from caller
+   to callee
+ + Refactor git_set_argv0_path() to git_extract_argv0_path()
+ + Move computation of absolute paths from Makefile to runtime (in
+   preparation for RUNTIME_PREFIX)
+
 ----------------------------------------------------------------
 [On Hold]
 
+* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits
+ - git commit: pathspec without -i/-o implies -i semantics during a
+   merge
+ - 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.
+
 * 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