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.
* jc/cachetree (Thu Sep 13 20:33:11 2007 -0700) 1 commit
+ Simplify cache API
This is a long overdue update to make the index API easier to
use correctly without breaking cache-trees.
* cr/reset (Fri Sep 14 01:19:30 2007 -0700) 5 commits
+ Simplify cache API
+ An additional test for "git-reset -- path"
+ Make "git reset" a builtin.
+ Move make_cache_entry() from merge-recursive.c into read-cache.c
+ Add tests for documented features of "git reset".
I found "git reset commit paths..." had problem in this series,
which was why jc/cachetree is merged into this topic to fix it.
Hopefully we can put this in 'master' soon, after giving it
another and final round of eyeballing.
* jc/partial-remove (Wed Sep 12 16:04:22 2007 -0700) 1 commit
+ git-commit: Allow partial commit of file removal.
This was actually branched off of 'maint', in the hope of
eventually being able to merge it there without dragging things
that happen in post 1.5.3 'master' branch. While I personally
think teaching ls-files about a tree to use as a reference is a
clever idea, it feels like a hack that is too special purpose.
It might be better to rewrite the part of git-commit that builds
temporary index in C (call that "git-commit--tool partial" or
something, following the tradition of "git-fetch--tool") to help
the process of eventually rewriting the whole thing in C.
* dk/diff-delta (Sat Sep 8 23:25:55 2007 +0200) 2 commits
+ diff-delta.c: Rationalize culling of hash buckets
+ diff-delta.c: pack the index structure
Will merge to 'master' this weekend.
* np/delta (Mon Sep 10 11:10:11 2007 -0400) 11 commits
+ threaded delta search: proper locking for cache accounting
+ threaded delta search: add pack.threads config variable
+ fix threaded delta search locking
+ threaded delta search: specify number of threads at run time
+ threaded delta search: better chunck split point
+ threaded delta search: refine work allocation
+ basic threaded delta search
+ rearrange delta search progress reporting
+ localize window memory usage accounting
+ straighten the list of objects to deltify
+ Keep last used delta base in the delta window
Will merge to 'master' this weekend.
* lh/svn-first-parent (Fri Sep 7 02:00:08 2007 +0200) 2 commits
+ git-svn: always use --first-parent
+ git-svn: add support for --first-parent
Will merge to 'master' this weekend.
* js/tag (Mon Sep 3 17:51:43 2007 +0100) 1 commit
+ verify-tag: also grok CR/LFs in the tag signature
Will merge to 'master' this weekend.
* js/remote (Sun Sep 2 21:10:14 2007 +0100) 1 commit
+ Teach "git remote" a mirror mode
Will merge to 'master' this weekend.
* jc/pack (Sat Sep 1 23:53:47 2007 -0700) 1 commit
+ Keep last used delta base in the delta window
Will merge to 'master' this weekend.
* ph/strbuf (Fri Sep 14 00:13:06 2007 +0200) 14 commits
+ archive: fix subst file generation
+ Replace all read_fd use with strbuf_read, and get rid of it.
+ Use strbufs to in read_message (imap-send.c), custom buffer--.
+ Use strbuf_read in builtin-fetch-tool.c.
+ Rework pretty_print_commit to use strbufs instead of custom
buffers.
+ Change semantics of interpolate to work like snprintf.
+ Strbuf API extensions and fixes.
+ Use strbuf API in cache-tree.c
+ Use strbuf API in buitin-rerere.c
+ Use strbuf API in apply, blame, commit-tree and diff
+ mktree: Simplify write_tree() using strbuf API
+ fast-import: Use strbuf API, and simplify cmd_data()
+ Simplify strbuf uses in archive-tar.c using strbuf API
+ Rework strbuf API and semantics.
Will merge to 'master' soon, perhaps next Wednesday.
* db/fetch-pack (Fri Sep 14 03:31:25 2007 -0400) 22 commits
- Always ensure the pack.keep file is removed by git-fetch
- Remove pack.keep after ref updates in git-fetch
- Refactor index-pack "keep $sha1" handling for reuse
- Simplify fetch transport API to just one function
- Replace custom memory growth allocator with ALLOC_GROW
- Remove unused unpacklimit variable from builtin-fetch
- Remove unnecessary debugging from builtin-fetch
- Fix off by one bug in reflog messages written by builtin-fetch
- Correct builtin-fetch to handle + in refspecs
- Make fetch a builtin
- Add bundle transport
- Move bundle specific stuff into bundle.[ch]
- Add fetch methods to transport library.
- Add matching and parsing for fetch-side refspec rules
- Push code for transport library
- Make fetch-pack a builtin with an internal API
- Report information on branches from remote.h
- Add uploadpack configuration info to remote.
- Modularize commit-walker
- Remove obsolete commit-walkers
- Make function to refill http queue a callback
- Refactor http.h USE_CURL_MULTI fill_active_slots().
This is Daniel's fetch-pack in C plus fixups from Shawn.
Unfortunately the fixups breaks t3200 ("*** glibc detected ***
fetch: free(): invalid pointer xxx ***"), which I haven't looked
into yet.
* jc/autogc (Sat Sep 8 12:01:51 2007 -0700) 5 commits
. (PARK) --repack-unpacked
- git-merge-pack [ --stdin | --limit=N ]
- git-merge-pack
+ Invoke "git gc --auto" from commit, merge, am and rebase.
+ Implement git gc --auto
This has been stalled. I do not really like the approach of
having a separate merge-pack command for performance reasons
Nico reminded me of, but updating pack-objects is taking longer
than I can keep my concentration on, and the topic has been
backburnered. The first two are usable as-is, so it might make
sense to merge them in 'master' first.
* jc/pathspec (Thu Sep 13 13:38:19 2007 -0700) 3 commits
- pathspec_can_match(): move it from builtin-ls-tree.c to tree.c
- ls-tree.c: refactor show_recursive() and rename it.
- tree-diff.c: split out a function to match a single pattern.
I've been meaning to unify the semantics of pathspec in "tree"
family and "index" family of commands. The former are "ls-tree",
"log/show/whatchanged", and "diff-tree" and do not understand
globs. The latter are "ls-files", "diff-index", and "grep" and
understand both path component prefix and globs. This is
progressing much more slowly than I would like...
* jc/stash-create (Mon Jul 9 00:51:23 2007 -0700) 2 commits
- rebase: allow starting from a dirty tree.
- stash: implement "stash create"
This is to allow "git rebase" from a dirty tree, and to serve as
an example to use "stash create". Will merge to 'next' this
weekend.
-
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
