--- /dev/null
+Subject: What's cooking in git.git (Nov 2008, #05; Sat, 15)
+X-master-at: ea4f2bd39dcfabb23e86b2f79149c6c4038ff3cd
+X-next-at: a277108ccd37bb47333edf23a681288943b48ef3
+
+What's cooking in git.git (Nov 2008, #05; Sat, 15)
+--------------------------------------------------
+
+Here are the topics that have been cooking. Commits prefixed
+with '-' are only in 'pu' while commits prefixed with '+' are
+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.
+
+----------------------------------------------------------------
+[New Topics]
+
+* lt/preload-lstat (Thu Nov 13 16:36:30 2008 -0800) 1 commit
+ - Add cache preload facility
+
+* 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).
+
+* ta/quiet-pull (Sat Nov 15 01:14:24 2008 +0100) 1 commit
+ - Teach/Fix pull/fetch -q/-v options
+
+This has my fixes to preserve "fetch -v -v" behaviour squashed in.
+
+----------------------------------------------------------------
+[Graduated to "master"]
+
+* mk/maint-cg-push (Mon Nov 10 22:47:11 2008 +0100) 1 commit
+ + git push: Interpret $GIT_DIR/branches in a Cogito compatible way
+
+Will need to further downmerge to 'maint'.
+
+* jk/maint-commit-v-strip (Wed Nov 12 03:25:52 2008 -0500) 1 commit
+ + 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]
+
+* bc/maint-keep-pack (Thu Nov 13 14:11:46 2008 -0600) 1 commit
+ + repack: only unpack-unreachable if we are deleting redundant packs
+
+This makes "repack -A -d" without -d do the same thing as "repack -a -d",
+which makes sense. This does not have to go to 'maint', though.
+
+* jk/commit-v-strip (Wed Nov 12 03:23:37 2008 -0500) 4 commits
+ + status: show "-v" diff even for initial commit
+ + Merge branch 'jk/maint-commit-v-strip' into jk/commit-v-strip
+ + wt-status: refactor initial commit printing
+ + define empty tree sha1 as a macro
+
+----------------------------------------------------------------
+[Actively Cooking]
+
+* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
+ + grep: skip files outside sparse checkout area
+ + checkout_entry(): CE_NO_CHECKOUT on checked out entries.
+ + Prevent diff machinery from examining worktree outside sparse
+ checkout
+ + ls-files: Add tests for --sparse and friends
+ + update-index: add --checkout/--no-checkout to update
+ CE_NO_CHECKOUT bit
+ + 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
+
+I think the basic idea and structure of this is sound. Let's see if
+people who try this feature can find holes in what it currently does.
+
+* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
+ - autoconf: Enable threaded delta search when pthreads are supported
+
+* 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.
+
+* nd/rename-cache (Sat Nov 8 18:27:33 2008 +0700) 2 commits
+ - diffcore-rename: add config option to allow to cache renames
+ - diffcore-rename: support rename cache
+
+I am moderately negative on this one in its current shape. We shouldn't
+have to be storing what can be recomputed (and recomputed differently in
+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
+ format
+ + git-blame: refactor code to emit "porcelain format" output
+
+----------------------------------------------------------------
+[On Hold]
+
+* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
+ - "git push": tellme-more protocol extension
+
+This seems to have a deadlock during communication between the peers.
+Someone needs to pick up this topic and resolve the deadlock before it can
+continue.
+
+* 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
+
+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.
--- /dev/null
+Subject: What's in git.git (Nov 2008, #03; Sat, 15)
+X-maint-at: 9e77353e0ea6e9e6d88ad1943570afb526d54a16
+X-master-at: ea4f2bd39dcfabb23e86b2f79149c6c4038ff3cd
+X-maint-was: c14639f7b14d3d856c7c1f6c097dd1cb9615a5d0
+X-master-was: 171d7661eda111d3e35f6e8097a1a3a07b30026c
+
+What's in git.git (Nov 2008, #03; Sat, 15)
+
+ maint 9e77353 (Documentation: git-svn: fix example for centralized SVN clone)
+ master ea4f2bd (Merge branch 'maint')
+------------------------------------------------------------------------
+
+Consider that the tip of 'master' is 1.6.1-rc0, although I haven't tagged
+it as such. There are a handful more topics cooking in 'next' and they
+are worthy of being in 1.6.1 final.
+
+
+* The 'maint' branch has these fixes since the last announcement.
+
+Brandon Casey (1):
+ revision.c: use proper data type in call to sizeof() within xrealloc
+
+Christian Couder (1):
+ Documentation: fix links to "everyday.html"
+
+Jan Krüger (1):
+ Documentation: git-svn: fix example for centralized SVN clone
+
+Linus Torvalds (1):
+ date/time: do not get confused by fractional seconds
+
+
+* The 'master' branch has these since the last announcement
+ in addition to the above.
+
+Alexander Gavrilov (14):
+ gitk: Allow forcing branch creation if it already exists
+ gitk: Fix file list context menu for merge commits
+ gitk: Allow starting gui blame for a specific line
+ gitk: Add Return and Escape bindings to dialogs
+ gitk: Make gitk dialog windows transient
+ gitk: Make cherry-pick call git-citool on conflicts
+ gitk: Implement a user-friendly Edit View dialog
+ git-gui: Fix focus transition in the blame viewer.
+ git-gui: Add the Show SSH Key item to the clone dialog.
+ git-gui: Request blame metadata in utf-8.
+ gitk: Add accelerators to frequently used menu commands
+ gitk: Fix transient windows on Win32 and MacOS
+ gitk: Fix commit encoding support
+ Documentation: New GUI configuration and command-line options.
+
+Brandon Casey (10):
+ t7700: demonstrate mishandling of objects in packs with a .keep file
+ packed_git: convert pack_local flag into a bitfield and add pack_keep
+ pack-objects: new option --honor-pack-keep
+ repack: don't repack local objects in packs with .keep file
+ repack: do not fall back to incremental repacking with [-a|-A]
+ builtin-gc.c: use new pack_keep bitfield to detect .keep file existence
+ t7700: demonstrate mishandling of loose objects in an alternate ODB
+ sha1_file.c: split has_loose_object() into local and non-local
+ counterparts
+ pack-objects: extend --local to mean ignore non-local loose objects too
+ t7700: test that 'repack -a' packs alternate packed objects
+
+Brian Gernhardt (1):
+ Avoid using non-portable `echo -n` in tests.
+
+David M. Syzdek (4):
+ Build: add NO_UINTMAX_T to support ancient systems
+ Add Makefile check for FreeBSD 4.9-SECURITY
+ Make Pthread link flags configurable
+ Add autoconf tests for pthreads
+
+Davide Libenzi (1):
+ xdiff: give up scanning similar lines early
+
+Deskin Miller (2):
+ git-svn: proper detection of bare repositories
+ git-svn: proper detection of bare repositories
+
+Eric Wong (4):
+ git-svn: don't escape tilde ('~') for http(s) URLs
+ git-svn: respect i18n.commitencoding config
+ git-svn: don't escape tilde ('~') for http(s) URLs
+ git-svn: respect i18n.commitencoding config
+
+Giuseppe Bilotta (3):
+ gitweb: make the supported snapshot formats array global
+ gitweb: retrieve snapshot format from PATH_INFO
+ gitweb: embed snapshot format parameter in PATH_INFO
+
+Jakub Narebski (1):
+ gitweb: Better processing format string in custom links in navbar
+
+Jeff King (11):
+ diff: add missing static declaration
+ document the diff driver textconv feature
+ refactor userdiff textconv code
+ userdiff: require explicitly allowing textconv
+ only textconv regular files
+ wt-status: load diff ui config
+ add userdiff textconv tests
+ enable textconv for diff in verbose status/commit
+ t5516: refactor oddball tests
+ receive-pack: detect push to current branch of non-bare repo
+ commit: Fix stripping of patch in verbose mode.
+
+Junio C Hamano (3):
+ t5303: work around printf breakage in dash
+ t5303: fix printf format string for portability
+ Update draft release notes to 1.6.1
+
+Linus Torvalds (4):
+ Add a 'source' decorator for commits
+ revision: make tree comparison functions take commits rather than trees
+ Make '--decorate' set an explicit 'show_decorations' flag
+ revision traversal: '--simplify-by-decoration'
+
+Marten Svanfeldt (dev) (2):
+ Git.pm: Make _temp_cache use the repository directory
+ git-svn: Update git-svn to use the ability to place temporary files
+ within repository directory
+
+Martin Koegler (1):
+ git push: Interpret $GIT_DIR/branches in a Cogito compatible way
+
+Miklos Vajna (4):
+ Implement git remote rename
+ remote: add a new 'origin' variable to the struct
+ git-remote rename: migrate from remotes/ and branches/
+ git-remote: document the migration feature of the rename subcommand
+
+Nanako Shiraishi (2):
+ Document "git log --source"
+ Document "git log --simplify-by-decoration"
+
+Nicolas Pitre (9):
+ close another possibility for propagating pack corruption
+ better validation on delta base object offsets
+ make unpack_object_header() non fatal
+ make packed_object_info() resilient to pack corruptions
+ make check_object() resilient to pack corruptions
+ make find_pack_revindex() aware of the nasty world
+ pack-objects: allow "fixing" a corrupted pack without a full repack
+ extend test coverage for latest pack corruption resilience improvements
+ pack-objects: don't leak pack window reference when splitting packs
+
+Paul Mackerras (8):
+ gitk: Fix some off-by-one errors in computing which line to blame
+ gitk: Add a menu item to show where a given line comes from
+ gitk: Make the background color of marked lines configurable
+ gitk: Unify handling of merge diffs with normal 2-way diffs
+ gitk: Make "show origin of this line" work on fake commits
+ gitk: Cope with unmerged files in local changes
+ gitk: Improve cherry-pick error handling
+ gitk: Fix linehtag undefined error with file highlighting
+
+Samuel Tardieu (2):
+ tag: Check that options are only allowed in the appropriate mode
+ tag: Add more tests about mixing incompatible modes and options
+
+Santi Béjar (1):
+ rev-list documentation: clarify the two parts of history simplification
+