git, branch v1.5.5-rc1

GIT 1.5.5-rc1

2008-03-23T07:22:29Z

Signed-off-by: Junio C Hamano

gc --auto: raise default auto pack limit from 20 to 50

2008-03-23T07:11:31Z

Recent discussion on the list, with the improvement f7c22cc (always start looking up objects in the last used pack first, 2007-05-30) brought in, reached the concensus that the current default 20 is too low. Reference: http://thread.gmane.org/gmane.comp.version-control.git/77586 Signed-off-by: Junio C Hamano

Merge branch 'git-p4' of git://repo.or.cz/git/git-p4

2008-03-23T07:02:06Z

* 'git-p4' of git://repo.or.cz/git/git-p4: git-p4: Use P4EDITOR environment variable when set git-p4: Unset P4DIFF environment variable when using 'p4 -du diff' git-p4: Optimize the fetching of data from perforce.

remote.c: Fix overtight refspec validation

2008-03-23T06:46:17Z

We tightened the refspec validation code in an earlier commit ef00d15 (Tighten refspec processing, 2008-03-17) per my suggestion, but the suggestion was misguided to begin with and it broke this usage: $ git push origin HEAD~12:master The syntax of push refspecs and fetch refspecs are similar in that they are both colon separated LHS and RHS (possibly prefixed with a + to force), but the similarity ends there. For example, LHS in a push refspec can be anything that evaluates to a valid object name at runtime (except when colon and RHS is missing, or it is a glob), while it must be a valid-looking refname in a fetch refspec. To validate them correctly, the caller needs to be able to say which kind of refspecs they are. It is unreasonable to keep a single interface that cannot tell which kind it is dealing with, and ask it to behave sensibly. This commit separates the parsing of the two into different functions, and clarifies the code to implement the parsing proper (i.e. splitting into two parts, making sure both sides are wildcard or neither side is). This happens to also allow pushing a commit named with the esoteric "look for that string" syntax: $ git push ../test.git ':/remote.c: Fix overtight refspec:master' Signed-off-by: Junio C Hamano

fast-import: Document the effect of "merge" with no "from" in a commit

2008-03-23T06:20:01Z

The fast-import documentation currently does not document the behaviour of "merge" when there is no "from" in a commit. This patch adds a description of what happens: the commit is created with a parent, but no files. This behaviour is equivalent to "from" followed by "filedeleteall". Signed-off-by: Eyvind Bernhardsen Acked-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

Make git-svn tests behave better on OS X

2008-03-23T00:53:12Z

Give lib-git-svn.sh a few alternate paths to look for apache2. Explicitly define the LockFile so httpd will actually start under OS X Signed-off-by: Kevin Ballard Acked-by: Eric Wong Signed-off-by: Junio C Hamano

Improve description of git filter-branch.

2008-03-23T00:25:16Z

Signed-off-by: Ralf Wildenhues Signed-off-by: Junio C Hamano

t/t7003-filter-branch.sh: use test_must_fail rather than '!'

2008-03-23T00:23:29Z

Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

Don't try and percent-escape existing percent escapes in git-svn URIs

2008-03-21T06:59:12Z

git-svn project names are percent-escaped ever since f5530b8 (git-svn: support for funky branch and project names over HTTP(S), 2007-11-11). Unfortunately this breaks the scenario where the user hands git-svn an already-escaped URI. Fix the regexp to skip over what looks like existing percent escapes, and test this scenario. Signed-off-by: Kevin Ballard Acked-by: Eric Wong Signed-off-by: Junio C Hamano

remote show: do not show symbolic refs

2008-03-20T00:33:30Z

For symbolic refs, a sane notion of being "stale" is that the ref they point to no longer exists. Since this is checked already, "remote show" does not need to show them at all. Incidentally, this fixes the issue that "HEAD" was shown as a stale ref by "remote show" in a freshly cloned repository. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano