git, branch v1.5.3-rc2

GIT v1.5.3-rc2

2007-07-15T23:41:17Z

Signed-off-by: Junio C Hamano

Demote git-p4import to contrib status.

2007-07-15T22:23:37Z

Move git-p4import.py and Documentation/git-p4import.txt into a contrib/p4import directory. Add a README there directing people to contrib/fast-import/git-p4 as a better alternative. Signed-off-by: Sean Estabrooks Signed-off-by: Junio C Hamano

Remove p4 rpm from git.spec.in.

2007-07-15T22:23:36Z

Signed-off-by: Sean Estabrooks Signed-off-by: Junio C Hamano

Remove "WITH_P4IMPORT" knob from the Makefile

2007-07-15T22:23:36Z

Signed-off-by: Sean Estabrooks Signed-off-by: Junio C Hamano

git-cvsserver: detect/diagnose write failure, etc.

2007-07-15T06:33:22Z

There were many operations that did not notice and report errors to the CVS client, which would have resulted in corrupt working tree. Signed-off-by: Jim Meyering Signed-off-by: Junio C Hamano

Use $(RM) in Makefiles instead of 'rm -f'

2007-07-15T06:31:01Z

Signed-off-by: Emil Medve Signed-off-by: Junio C Hamano

Merge branch 'master' of git://repo.or.cz/git/fastimport

2007-07-15T05:57:47Z

* 'master' of git://repo.or.cz/git/fastimport: Teach fast-import to recursively copy files/directories Fix git-p4 on Windows to not use the Posix sysconf function. Correct trivial typo in fast-import documentation

Documentation/git-commit-tree: remove description of a nonexistent limitation

2007-07-15T05:56:47Z

Noticed by Geoff Richards. Signed-off-by: Junio C Hamano

Make every builtin-*.c file #include "builtin.h"

2007-07-15T05:44:09Z

Make every builtin-*.c file #include "builtin.h". Also takes care of some declaration/definition mismatches. Signed-off-by: Peter Hagervall Signed-off-by: Junio C Hamano

Teach fast-import to recursively copy files/directories

2007-07-15T05:41:23Z

Some source material (e.g. Subversion dump files) perform directory renames by telling us the directory was copied, then deleted in the same revision. This makes it difficult for a frontend to convert such data formats to a fast-import stream, as all the frontend has on hand is "Copy a/ to b/; Delete a/" with no details about what files are in a/, unless the frontend also kept track of all files. The new 'C' subcommand within a commit allows the frontend to make a recursive copy of one path to another path within the branch, without needing to keep track of the individual file paths. The metadata copy is performed in memory efficiently, but is implemented as a copy-immediately operation, rather than copy-on-write. With this new 'C' subcommand frontends could obviously implement an 'R' (rename) on their own as a combination of 'C' and 'D' (delete), but since we have already offered up 'R' in the past and it is a trivial thing to keep implemented I'm not going to deprecate it. Signed-off-by: Shawn O. Pearce