user/sven/git.git, branch v1.6.0.2

GIT 1.6.0.2

2008-09-12T23:18:47Z

Signed-off-by: Junio C Hamano

Merge branch 'ho/maint-dashless' into maint

2008-09-12T23:15:23Z

* ho/maint-dashless: Start conforming code to "git subcmd" style part 2

Fix some manual typos.

2008-09-12T20:19:56Z

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

Use compatibility regex library also on FreeBSD

2008-09-11T16:44:28Z

Commit 3632cfc24 makes the same change for Darwin; however, the problem also exists on FreeBSD. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Use compatibility regex library also on AIX

2008-09-11T08:23:16Z

This augments 3632cfc24 (Use compatibility regex library on Darwin, 2008-09-07), which already carries a "Tested-by" statement for AIX, but that test was actually done with this patch included. Signed-off-by: Johannes Sixt Tested-by: Mike Ralphson Signed-off-by: Junio C Hamano

Update draft release notes for 1.6.0.2

2008-09-10T20:38:20Z

Signed-off-by: Junio C Hamano

Use compatibility regex library for OSX/Darwin

2008-09-10T20:36:40Z

The standard libc regex library on OSX does not support alternation in POSIX Basic Regular Expression mode. This breaks the diff.funcname functionality on OSX. To fix this, we use the GNU regex library which is already present in the compat/ diretory for the MinGW port. However, simply adding compat/ to the COMPAT_CFLAGS variable causes a conflict between the system fnmatch.h and the one present in compat/. To remedy this, move the regex and fnmatch functionality to their own subdirectories in compat/ so they can be included seperately. Signed-off-by: Arjen Laarhoven Tested-by: Mike Ralphson (AIX) Tested-by: Johannes Sixt (MinGW) Signed-off-by: Junio C Hamano

git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl

2008-09-10T18:47:06Z

Signed-off-by: Marcus Griep Signed-off-by: Junio C Hamano

Git.pm: Use File::Temp->tempfile instead of ->new

2008-09-10T18:45:22Z

Perl 5.8.0 ships with File::Temp 0.13, which does not have the new() interface introduced in 0.14, as pointed out by Tom G. Christensen. This modifies Git.pm to use the more established tempfile() interface and updates 'git svn' to match. Signed-off-by: Marcus Griep Acked-by: Eric Wong Tested-by: Tom G. Christensen Signed-off-by: Junio C Hamano

t7501: always use test_cmp instead of diff

2008-09-10T18:16:10Z

This should make the output more readable (by default using diff -u) when some tests fail. Also changed the diff order from "current expected" to "expected current". Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano