delta/git.git, branch v1.5.3.2

GIT 1.5.3.2

2007-09-19T10:11:28+00:00

Signed-off-by: Junio C Hamano

Fixed update-hook example allow-users format.

2007-09-19T00:38:52+00:00

The example provided with the update-hook-example does not work on
either bash 2.05b.0(1)-release nor 3.1.17(1)-release. The matcher did
not match the lines that it advertised to match, such as:

refs/heads/bw/        linus
refs/heads/tmp/*      *

In POSIX 1003.2 regular expressions, the star (*), is not an wildcard
meaning "match everything", it matches 0 or more matches of the atom
preceding it.

So to match "refs/heads/bw/topic-branch", the matcher should be written
as "refs/heads/bw/.*" to match "refs/heads/bw/" and everything after it.

Signed-off-by: Junio C Hamano

Documentation/git-svn: updated design philosophy notes

2007-09-19T00:07:45+00:00

This section has not been updated in a while and
--branches/--tags/--trunk options are commonly used nowadays.

Noticed-by: Lars Hjemli 
Signed-off-by: Eric Wong 
Signed-off-by: Junio C Hamano

t/t4014: test "am -3" with mode-only change.

2007-09-18T22:19:47+00:00

Earlier commit ece7b74903007cee8d280573647243d46a6f3a95 added a test
for rebase that uses "am -3", but this adds a test to check "am -3"
itself.

Signed-off-by: Junio C Hamano

Fix lapsus in builtin-apply.c

2007-09-18T21:09:12+00:00

Signed-off-by: Pierre Habouzit 
Signed-off-by: Junio C Hamano

git-push: documentation and tests for pushing only branches

2007-09-18T21:00:20+00:00

Commit 098e711e caused git-push to match only branches when
considering which refs to push. This patch updates the
documentation accordingly and adds a test for this behavior.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

git-svnimport: Use separate arguments in the pipe for git-rev-parse

2007-09-18T21:00:20+00:00

Some people seem to create SVN branch names with spaces
or other shell metacharacters.

Signed-off-by: Matthias Urlichs 
Signed-off-by: Junio C Hamano

Document ls-files --with-tree=

2007-09-18T06:57:35+00:00

Signed-off-by: Junio C Hamano

git-commit: partial commit of paths only removed from the index

2007-09-18T06:57:35+00:00

Because a partial commit is meant to be a way to ignore what are
staged in the index, "git rm --cached A && git commit A" should
just record what is in A on the filesystem.  The previous patch
made the command sequence to barf, saying that A has not been
added yet.  This fixes it.

Signed-off-by: Junio C Hamano

git-commit: Allow partial commit of file removal.

2007-09-18T06:57:35+00:00

When making a partial commit, git-commit uses git-ls-files with
the --error-unmatch option to expand and sanity check the user
supplied path patterns.  When any path pattern does not match
with the paths known to the index, it errors out, in order to
catch a common mistake to say "git commit Makefiel cache.h"
and end up with a commit that touches only cache.h (notice the
misspelled "Makefile").  This detection however does not work
well when the path has already been removed from the index.

If you drop a path from the index and try to commit that
partially, i.e.

	$ git rm COPYING
	$ git commit -m 'Remove COPYING' COPYING

the command complains because git does not know anything about
COPYING anymore.

This introduces a new option --with-tree to git-ls-files and
uses it in git-commit when we build a temporary index to
write a tree object for the partial commit.

When --with-tree= option is specified, names from the
given tree are added to the set of names the index knows about,
so we can treat COPYING file in the example as known.

Of course, there is no reason to use "git rm" and git-aware
people have long time done:

	$ rm COPYING
	$ git commit -m 'Remove COPYING' COPYING

which works just fine.  But this caused a constant confusion.

Signed-off-by: Junio C Hamano