What's in git.git

From: Junio C Hamano
Date: Sat Nov 25 2006 - 05:15:15 EST


Executive Summary
=================

The 'maint' branch still has a handful more post v1.4.4.1
fixes.

Aside from the usual gitweb and git-svn updates, the 'master'
branch has one notable change that everybody should hopefully
welcome. separate-remote layout is now the default for newly
cloned repositories. We would be needing documentation updates
and probably some more minor fixes for fallout from this, but I
do not expect anything majorly broken.

Cooking in 'next' are handful topics:

* "git shortlog bottom..top" can be used instead of a pipeline
"git log bottom..top | git shortlog".

* "git merge -m message <commit>" is another natural way to
perform a local merge, in addition to the traditional
"git pull . <localbranch>". The former is more powerful in
that it can take arbitrary <committish>, not just a ref.

* The new "--depth $n" parameter to git clone/fetch tries to
limit the commit ancestry depth to $n. This still has known
issues (for example, shallowly cloning the git.git repository
and then deepening the result with large --depth parameter
later does not seem to make the resulting repository fully
connected, and fsck-objects reports corruption), so please
handle it with care.

* "git show-ref", especially the "-d" variant, is much more
efficient when used in a repository with pack-pruned refs.

* "git fetch" can fetch from a repository with pack-pruned refs
over dumb protocol transports.

* "git push $URL '':$ref" can be used to delete an existing ref
from the remote side.

* A glob pattern "Pull: refs/heads/*:refs/remotes/origin/*" is
allowed in the remotes file. The fetch can be forced by
prefixing the specification with a '+'.

Currently 'pu' does not have much to speak of.

This update has rather large impact so the kernel list is CC'ed.

----------------------------------------------------------------

* The 'maint' branch has these fixes since the last announcement.

Andy Parkins (1):
Increase length of function name buffer

Eric Wong (3):
git-svn: error out from dcommit on a parent-less commit
git-svn: correctly handle revision 0 in SVN repositories
git-svn: preserve uncommitted changes after dcommit

René Scharfe (1):
archive-zip: don't use sizeof(struct ...)


* The 'master' branch has these since the last announcement.

Andy Parkins (3):
Improve git-prune -n output
Add support to git-branch to show local and remote branches
Increase length of function name buffer

Eric Wong (6):
git-svn: error out from dcommit on a parent-less commit
git-svn: correctly handle revision 0 in SVN repositories
git-svn: preserve uncommitted changes after dcommit
git-svn: handle authentication without relying on cached tokens on disk
git-svn: correctly access repos when only given partial read permissions
git-svn: exit with status 1 for test failures

Iñaki Arenaza (1):
git-cvsimport: add support for CVS pserver method HTTP/1.x proxying

Jakub Narebski (8):
gitweb: Protect against possible warning in git_commitdiff
gitweb: Buffer diff header to deal with split patches + git_patchset_body refactoring
gitweb: Default to $hash_base or HEAD for $hash in "commit" and "commitdiff"
gitweb: New improved formatting of chunk header in diff
gitweb: Add an option to href() to return full URL
gitweb: Refactor feed generation, make output prettier, add Atom feed
gitweb: Finish restoring "blob" links in git_difftree_body
gitweb: Replace SPC with &nbsp; also in tag comment

Junio C Hamano (9):
upload-pack: stop the other side when they have more roots than we do.
apply --numstat: mark binary diffstat with - -, not 0 0
pack-objects: tweak "do not even attempt delta" heuristics
refs outside refs/{heads,tags} match less strongly.
Typefix builtin-prune.c::prune_object()
gitweb: (style) use chomp without parentheses consistently.
git-clone: stop dumb protocol from copying refs outside heads/ and tags/.
git-branch -D: make it work even when on a yet-to-be-born branch
git-fetch: exit with non-zero status when fast-forward check fails

Lars Hjemli (1):
Add -v and --abbrev options to git-branch

Peter Baumann (1):
config option log.showroot to show the diff of root commits

Petr Baudis (1):
Make git-clone --use-separate-remote the default

René Scharfe (1):
archive-zip: don't use sizeof(struct ...)


* The 'next' branch, in addition, has these.

Alexandre Julliard (6):
Shallow clone: do not ignore shallowness when following tags
fetch-pack: Properly remove the shallow file when it becomes empty.
upload-pack: Check for NOT_SHALLOW flag before sending a shallow to the client.
git-fetch: Reset shallow_depth before auto-following tags.
get_shallow_commits: Avoid memory leak if a commit has been reached already.
fetch-pack: Do not fetch tags for shallow clones.

Jakub Narebski (1):
gitweb: Do not use esc_html in esc_path

Johannes Schindelin (10):
Build in shortlog
shortlog: do not crash on parsing "[PATCH"
shortlog: read mailmap from ./.mailmap again
shortlog: handle email addresses case-insensitively
shortlog: fix "-n"
upload-pack: no longer call rev-list
support fetching into a shallow repository
allow cloning a repository "shallowly"
allow deepening of a shallow repository
add tests for shallow stuff

Junio C Hamano (19):
Store peeled refs in packed-refs file.
remove merge-recursive-old
git-merge: make it usable as the first class UI
merge: allow merging into a yet-to-be-born branch.
git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 2)
Store peeled refs in packed-refs (take 2).
git-fetch: reuse ls-remote result.
git-fetch: fix dumb protocol transport to fetch from pack-pruned ref
git-fetch: allow glob pattern in refspec
Allow git push to delete remote ref.
We should make sure that the protocol is still extensible.
Why does it mean we do not have to register shallow if we have one?
Why didn't we mark want_obj as ~UNINTERESTING in the old code?
shallow clone: unparse and reparse an unshallowed commit
git-shortlog: fix common repository prefix abbreviation.
git-shortlog: make common repository prefix configurable with .mailmap
git-commit: show --summary after successful commit.
git-fetch: allow forcing glob pattern in refspec
fetch-pack: do not barf when duplicate re patterns are given

Nicolas Pitre (1):
builtin git-shortlog is broken


* The 'pu' branch, in addition, has these.

Junio C Hamano (4):
para-walk: walk n trees, index and working tree in parallel
rev-list --left-right
blame: --show-stats for easier optimization work.
gitweb: steal loadavg throttle from kernel.org


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/