Probably a few topics from the following will graduate to 'master' this weekend, but otherwise I expect that I'll be extremely slow and won't be doing much git next week. 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. "pu" also contains "pu" from git-gui as of tonight. * ar/clone (Wed Jun 6 16:39:05 2007 -0700) 1 commit - Fix clone to setup the origin if its name ends with .git This is meant to be merged to 'maint' as part of 1.5.2.2, but I am taking things slowly. * js/merge (Tue Jun 5 03:37:13 2007 +0100) 1 commit + git-merge-file: refuse to merge binary files This series needs to be cherry-picked to 'maint' at some point. * js/filter (Wed Jun 6 20:38:35 2007 +0200) 8 commits + filter-branch: also don't fail in map() if a commit cannot be mapped + filter-branch: Use rev-list arguments to specify revision ranges. + filter-branch: fix behaviour of '-k' + filter-branch: use $(($i+1)) instead of $((i+1)) + chmod +x git-filter-branch.sh + filter-branch: prevent filters from reading from stdin + t7003: make test repeatable + Add git-filter-branch Johannes & Johannes work well together ;-). Will push out to 'master' shortly. * lh/submodule (Wed Jun 6 11:13:02 2007 +0200) 2 commits + git-submodule: clone during update, not during init + git-submodule: move cloning into a separate function Will push out to 'master' shortly. * aj/pack (Sun Jun 3 20:21:41 2007 +0200) 1 commit + pack-check: Sort entries by pack offset before unpacking them. Makes "git fsck --full" go a lot faster. Will push out to 'master' shortly. * aw/cvs (Mon Jun 4 10:01:49 2007 +0100) 3 commits + cvsimport: add <remote>/HEAD reference in separate remotes more + cvsimport: update documentation to include separate remotes option + cvsimport: add support for new style remote layout Makes the ref layout consistent with git managed branches; git-svn already does this, I think. * ep/cvstag (Sun Jun 3 02:56:36 2007 -0400) 1 commit + Use git-tag in git-cvsimport Instead of handrolling a tag using lower-level mktag, this uses git-tag. * jh/tag (Mon Jun 4 02:54:56 2007 +0200) 6 commits + Add fsck_verify_ref_to_tag_object() to verify that refname matches name stored in tag object + git-mktag tests: Fix and expand the mktag tests according to the new tag object structure + Documentation/git-mktag: Document the changes in tag object structure + git-fsck: Do thorough verification of tag objects. + git-show: When showing tag objects with no tag name, show tag object's SHA1 instead of an empty string + Refactor git tag objects; make "tag" header optional; introduce new optional "keywords" header Tag refactoring. Looking good. * ml/worktree (Wed Jun 6 23:29:59 2007 +0200) 8 commits - setup_git_directory: fix segfault if repository is found in cwd - test GIT_WORK_TREE - extend rev-parse test for --is-inside-work-tree - Use new semantics of is_bare/inside_git_dir/inside_work_tree - introduce GIT_WORK_TREE to specify the work tree - test git rev-parse - rev-parse: introduce --is-bare-repository - rev-parse: document --is-inside-git-dir Allows you to have GIT_DIR environment that points at a repository at an unrelated location, and still lets you work in a working tree subdirectory by pointing its root with another environment variable. It is an intrusive set of changes. * ei/worktree+filter (Wed Jun 6 09:16:56 2007 +0200) 1 commit - filter-branch: always export GIT_DIR if it is set This is "early integration" that depends on two other topics (GIT_WORK_TREE and filter-branch). This needs to be merged when both topics graduate to 'master'. * dh/repack (Fri May 25 14:40:24 2007 -0700) 1 commit - Enhance unpack-objects for live repo and large objects * jc/blame (Fri Apr 20 16:25:50 2007 -0700) 4 commits - blame: show log as it goes - git-blame: optimize get_origin() from linear search to hash- lookup. - git-blame: pass "struct scoreboard *" pointers around. - blame: lift structure definitions up * jc/diff (Mon Dec 25 01:08:50 2006 -0800) 2 commits - test-para: combined diff between HEAD, index and working tree. - para-walk: walk n trees, index and working tree in parallel - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
