Junio C HamanoHere 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.
* jc/rm (Fri Dec 22 01:02:59 2006 -0800) 2 commits - t3600: update the test for updated git rm - git-rm: update to saner semantics
This still needs 'require -r to descend into directories' safety. I'd really want to have this in v1.5.0.
* jc/fsck-reflog (Fri Dec 22 00:46:33 2006 -0800) 8 commits + reflog expire: prune commits that are not incomplete + Don't crash during repack of a reflog with pruned commits. + git reflog expire + Move in_merge_bases() to commit.c + reflog: fix warning message. + Teach git-repack to preserve objects referred to by reflog entries. + Protect commits recorded in reflog from pruning. + add for_each_reflog_ent() iterator
The latest 'reflog expire' hopefully should revive Shawn's repository and make prune or repack working again for him.
Tip for 'next' users. fsck and prune consider commits that are referenced by reflog entries reachable, but your repositories may have been pruned by earlier 'prune' already, which may cause repack to barf and refuse. Please use 'reflog expire --all' to prune out reflog entries that refer to commits that are already lost if repack fails in your repository and try again.
Because we have made the reflog enabled by default, I really would want to have this in v1.5.0 to prevent unbounded growth of reflog files.
I think none of the rest are 'must have's for v1.5.0. Perhaps except for js/rerere series.
* js/rerere (Wed Dec 20 17:39:41 2006 +0100) 3 commits + Make git-rerere a builtin + Add a test for git-rerere + move read_mmfile() into xdiff-interface * jc/skip-count (Tue Dec 19 18:25:32 2006 -0800) 1 commit + revision: --skip=<n> * jn/web (Sat Dec 16 17:12:55 2006 +0100) 1 commit - gitweb: Add some mod_perl specific support * jc/git-add--interactive (Mon Dec 11 17:09:26 2006 -0800) 2 commits + git-add --interactive: hunk splitting + git-add --interactive * jc/explain (Mon Dec 4 19:35:04 2006 -0800) 1 commit - git-explain * jc/3way (Wed Nov 29 18:53:13 2006 -0800) 1 commit + git-merge: preserve and merge local changes when doing fast forward * js/shallow (Fri Nov 24 16:00:13 2006 +0100) 15 commits + fetch-pack: Do not fetch tags for shallow clones. + get_shallow_commits: Avoid memory leak if a commit has been reached already. + git-fetch: Reset shallow_depth before auto-following tags. + upload-pack: Check for NOT_SHALLOW flag before sending a shallow to the client. + fetch-pack: Properly remove the shallow file when it becomes empty. + shallow clone: unparse and reparse an unshallowed commit + Why didn't we mark want_obj as ~UNINTERESTING in the old code? + Why does it mean we do not have to register shallow if we have one? + We should make sure that the protocol is still extensible. + add tests for shallow stuff + Shallow clone: do not ignore shallowness when following tags + allow deepening of a shallow repository + allow cloning a repository "shallowly" + support fetching into a shallow repository + upload-pack: no longer call rev-list * jc/web (Wed Nov 8 14:54:09 2006 -0800) 1 commit - gitweb: steal loadavg throttle from kernel.org * jc/pickaxe (Sun Nov 5 11:52:43 2006 -0800) 1 commit - blame: --show-stats for easier optimization work. * jc/diff (Mon Sep 25 23:03:34 2006 -0700) 1 commit - para-walk: walk n trees, index and working tree in parallel * jc/diff-apply-patch (Fri Sep 22 16:17:58 2006 -0700) 1 commit + git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 2)
