What's cooking (2008/11 #06)

16 years ago · 2f8d35af00
1 changed files with 125 additions and 117 deletions
--- a/whats-cooking.txt
+++ b/whats-cooking.txt
@ -1,8 +1,8 @@
-Subject: What's cooking in git.git (Nov 2008, #05; Sat, 15)
+Subject: What's cooking in git.git (Nov 2008, #06; Wed, 26)
-X-master-at: ea4f2bd39dcfabb23e86b2f79149c6c4038ff3cd
+X-master-at: aa14a0c3f191ee4df7344eed119be5b4a527a0ff
-X-next-at: a277108ccd37bb47333edf23a681288943b48ef3
+X-next-at: 406979f7fe53d139cdb79bf8c5eecf8735f4f146
-What's cooking in git.git (Nov 2008, #05; Sat, 15)
+What's cooking in git.git (Nov 2008, #06; Wed, 26)
 --------------------------------------------------
 Here are the topics that have been cooking.  Commits prefixed
@ -15,109 +15,99 @@ meant to be merged to the maintenance series have "maint-" in their names.
 ----------------------------------------------------------------
 [New Topics]
-* lt/preload-lstat (Thu Nov 13 16:36:30 2008 -0800) 1 commit
+* cr/remote-update-v (Tue Nov 18 19:04:02 2008 +0800) 1 commit
- - Add cache preload facility
+ + git-remote: add verbose mode to git remote update
-* cb/mergetool (Thu Nov 13 12:41:15 2008 +0000) 3 commits
+Should be in 1.6.1-rc1.
 - [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,
+* rs/strbuf-expand (Sun Nov 23 00:16:59 2008 +0100) 6 commits
-and also waiting for comments from the original author (Ted).
+ + 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
-* ta/quiet-pull (Sat Nov 15 01:14:24 2008 +0100) 1 commit
+Should be in 1.6.1-rc1.
 - Teach/Fix pull/fetch -q/-v options
-This has my fixes to preserve "fetch -v -v" behaviour squashed in.
+* 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
----------------------------------------------------------------
+Should be in 1.6.1-rc1 and backmerged to 'maint'.
-[Graduated to "master"]
+
 * st/levenshtein (Thu Nov 20 14:27:27 2008 +0100) 2 commits
 + Document levenshtein.c
 + Fix deletion of last character in levenshtein distance
 Should be in 1.6.1-rc1.
 * 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
 Should be in 1.6.1-rc1 and backmerged to 'maint'.
 * 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()
 Should be in 1.6.1-rc1.
 * pw/maint-p4 (Wed Nov 26 13:52:15 2008 -0500) 1 commit
 - git-p4: fix keyword-expansion regex
 Waiting for Ack from git-p4 folks.
 * cc/bisect-skip (Sun Nov 23 22:02:49 2008 +0100) 1 commit
 - bisect: teach "skip" to accept special arguments like "A..B"
 Should be in 1.6.1-rc1.
 * cc/bisect-replace (Mon Nov 24 22:20:30 2008 +0100) 9 commits
 - bisect: add "--no-replace" option to bisect without using replace
   refs
 - rev-list: make it possible to disable replacing using "--no-
   bisect-replace"
 - bisect: use "--bisect-replace" options when checking merge bases
 - merge-base: add "--bisect-replace" option to use fixed up revs
 - commit: add "bisect_replace_all" prototype to "commit.h"
 - rev-list: add "--bisect-replace" to list revisions with fixed up
   history
 - Documentation: add "git bisect replace" documentation
 - bisect: add test cases for "git bisect replace"
 - bisect: add "git bisect replace" subcommand
 I really hate the idea of introducing a potentially much more useful
 replacement of the existing graft mechanism and tie it very tightly to
 bisect, making it unusable from outside.
 (1) I do not think "bisect replace" workflow is a practical and usable
     one;
 (2) The underlying mechanism to express "this object replaces that other
     object" is much easier to work with than what the graft does which is
     "the parents of this commit are these", and idea to use the normal
     ref to point at them means this can potentially be used for
     transferring the graft information across repositories, which the
     current graft mechanism cannot do.
 (3) Because I like the aspect (2) of this series so much, it deeply
     disappoints and troubles me that this is implemented minimally near
     the surface, and that it is controlled by the "bisect" Porcelain
     alone, by explicitly passing command line arguments.
-* mk/maint-cg-push (Mon Nov 10 22:47:11 2008 +0100) 1 commit
+I think a mechanism like this should be added to replace grafts, but it
- + git push: Interpret $GIT_DIR/branches in a Cogito compatible way
+should always be enabled for normal revision traversal operation, while
-
+always disabled for object enumeration and transfer operation (iow, fsck,
-Will need to further downmerge to 'maint'.
+fetch and push should use the real ancestry information recorded in the
-
+underlying objects, while rev-list, log, etc. should always use the
-* jk/maint-commit-v-strip (Wed Nov 12 03:25:52 2008 -0500) 1 commit
+replaced objects).  I have a suspicion that even cat-file could honor it.
 + commit: Fix stripping of patch in verbose mode.
 Will need to further downmerge to 'maint'.
 * st/maint-tag (Wed Nov 5 00:20:36 2008 +0100) 2 commits
 + tag: Add more tests about mixing incompatible modes and options
 + tag: Check that options are only allowed in the appropriate mode
 Will need to further downmerge to 'maint'.
 * jk/deny-push-to-current (Sat Nov 8 20:49:27 2008 -0500) 2 commits
 + receive-pack: detect push to current branch of non-bare repo
 + t5516: refactor oddball tests
 * dl/xdiff (Fri Nov 7 21:24:33 2008 -0800) 1 commit
 + xdiff: give up scanning similar lines early
 This performance fix may eventually need to be cherry-picked to 'maint'.
 * lt/decorate (Wed Nov 12 11:51:28 2008 +0100) 7 commits
 + rev-list documentation: clarify the two parts of history
   simplification
 + Document "git log --simplify-by-decoration"
 + Document "git log --source"
 + revision traversal: '--simplify-by-decoration'
 + Make '--decorate' set an explicit 'show_decorations' flag
 + revision: make tree comparison functions take commits rather than
   trees
 + Add a 'source' decorator for commits
 * gb/gitweb-snapshot-pathinfo (Sun Nov 2 10:21:39 2008 +0100) 3 commits
 + gitweb: embed snapshot format parameter in PATH_INFO
 + gitweb: retrieve snapshot format from PATH_INFO
 + gitweb: make the supported snapshot formats array global
 * jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit
 + gitweb: Better processing format string in custom links in navbar
 * jk/diff-convfilter (Sun Oct 26 00:50:02 2008 -0400) 8 commits
 + enable textconv for diff in verbose status/commit
 + wt-status: load diff ui config
 + only textconv regular files
 + userdiff: require explicitly allowing textconv
 + refactor userdiff textconv code
 + add userdiff textconv tests
 + document the diff driver textconv feature
 + diff: add missing static declaration
 * jk/diff-convfilter-test-fix (Fri Oct 31 01:09:13 2008 -0400) 1 commit
 + Avoid using non-portable `echo -n` in tests.
 An update to the one above.
 * np/pack-safer (Sun Nov 9 13:11:06 2008 -0800) 11 commits
 + t5303: fix printf format string for portability
 + t5303: work around printf breakage in dash
 + pack-objects: don't leak pack window reference when splitting
   packs
 + extend test coverage for latest pack corruption resilience
   improvements
 + pack-objects: allow "fixing" a corrupted pack without a full
   repack
 + make find_pack_revindex() aware of the nasty world
 + make check_object() resilient to pack corruptions
 + make packed_object_info() resilient to pack corruptions
 + make unpack_object_header() non fatal
 + better validation on delta base object offsets
 + close another possibility for propagating pack corruption
 * mv/remote-rename (Mon Nov 10 21:43:03 2008 +0100) 4 commits
 + git-remote: document the migration feature of the rename
   subcommand
 + git-remote rename: migrate from remotes/ and branches/
 + remote: add a new 'origin' variable to the struct
 + Implement git remote rename
 ----------------------------------------------------------------
-[Will merge to "master" soon]
+[Graduated to "master"]
 * bc/maint-keep-pack (Thu Nov 13 14:11:46 2008 -0600) 1 commit
 + repack: only unpack-unreachable if we are deleting redundant packs
@ -132,9 +122,18 @@ which makes sense.  This does not have to go to 'maint', though.
 + define empty tree sha1 as a macro
 ----------------------------------------------------------------
-[Actively Cooking]
+[Will merge to "master" soon]
 * lt/preload-lstat (Mon Nov 17 09:01:20 2008 -0800) 2 commits
 + Fix index preloading for racy dirty case
 + Add cache preload facility
 * 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
-* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
+* nd/narrow (Tue Nov 18 06:33:16 2008 -0500) 10 commits
 + t2104: touch portability fix
 + grep: skip files outside sparse checkout area
 + checkout_entry(): CE_NO_CHECKOUT on checked out entries.
 + Prevent diff machinery from examining worktree outside sparse
@ -147,26 +146,25 @@ which makes sense.  This does not have to go to 'maint', though.
 + Introduce CE_NO_CHECKOUT bit
 + Extend index to save more flags
-I think the basic idea and structure of this is sound.  Let's see if
+* ph/send-email (Tue Nov 11 00:54:02 2008 +0100) 4 commits
-people who try this feature can find holes in what it currently does.
+ + 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.
-* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
+----------------------------------------------------------------
- - autoconf: Enable threaded delta search when pthreads are supported
+[Actively Cooking]
-* ph/send-email (Tue Nov 11 00:54:02 2008 +0100) 4 commits
+* cb/mergetool (Thu Nov 13 12:41:15 2008 +0000) 3 commits
- - git send-email: ask less questions when --compose is used.
+ - [DONTMERGE] Add -k/--keep-going option to mergetool
- - git send-email: add --annotate option
+ - Add -y/--no-prompt option to mergetool
- - git send-email: interpret unknown files as revision lists
+ - Fix some tab/space inconsistencies in git-mergetool.sh
 - git send-email: make the message file name more specific.
-* nd/rename-cache (Sat Nov 8 18:27:33 2008 +0700) 2 commits
+Jeff had good comments on the last one; the discussion needs concluded,
- - diffcore-rename: add config option to allow to cache renames
+and also waiting for comments from the original author (Ted).
 - diffcore-rename: support rename cache
-I am moderately negative on this one in its current shape.  We shouldn't
+* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
-have to be storing what can be recomputed (and recomputed differently in
+ - autoconf: Enable threaded delta search when pthreads are supported
 later software), and we shouldn't be keeping such cached result
 indefinitely.
 * jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
 + blame: show "previous" information in --porcelain/--incremental
@ -190,3 +188,13 @@ continue.
 This would be the right thing to do for command line use,
 but gitk will be hit due to tcl/tk's limitation, so I am holding
 this back for now.
 * jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
 - git-am --forge: add Signed-off-by: line for the author
 - git-am: clean-up Signed-off-by: lines
 - stripspace: add --log-clean option to clean up signed-off-by:
   lines
 - stripspace: use parse_options()
 - Add "git am -s" test
 - git-am: refactor code to add signed-off-by line for the committer