git/t, branch v1.6.3

t4029: use sh instead of bash

2009-05-07T01:16:26Z

Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

t4200: convert sed expression which operates on non-text file to perl

2009-05-06T23:43:29Z

POSIX only requires sed to work on text files and MERGE_RR is not a text file. Some versions of sed complain that this file is not newline terminated, and exit non-zero. Use perl instead which does not have a problem with it. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

t4200: remove two unnecessary lines

2009-05-06T23:43:28Z

These two lines appear to be unnecessary. They set variables which are not used afterwards. The primary motivation to remove them is that the sed invocation exits non-zero for seds which require newline termination of input files. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

t/annotate-tests.sh: avoid passing a non-newline terminated file to sed

2009-05-06T18:50:44Z

Some versions of sed exit non-zero if the file they are supplied is not newline terminated. Solaris's /usr/xpg4/bin/sed is one such sed. So rework this test to avoid doing so. This affects tests t8001-annotate.sh and t8002-blame.sh. Signed-off-by: Junio C Hamano

t4118: avoid sed invocation on file without terminating newline

2009-05-06T18:49:14Z

Some versions of sed exit non-zero if the file they are supplied is not newline terminated. Solaris's /usr/xpg4/bin/sed is one such sed. In this case the sed invocation can be avoided entirely since the resulting file is equivalent to a previously created file. So, just copy that file into place instead. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

t4118: add missing '&&'

2009-05-06T18:49:05Z

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

t8005: use egrep when extended regular expressions are required

2009-05-06T18:48:58Z

Not all versions of grep understand backslashed extended regular expressions. Possibly only gnu grep does. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

Merge branch 'maint'

2009-05-06T05:52:17Z

* maint: improve error message in config.c t4018-diff-funcname: add cpp xfuncname pattern to syntax test Work around BSD whose typeof(tv.tv_sec) != time_t git-am.txt: reword extra headers in message body git-am.txt: Use date or value instead of time or timestamp git-am.txt: add an 'a', say what 'it' is, simplify a sentence dir.c: Fix two minor grammatical errors in comments git-svn: fix a sloppy Getopt::Long usage

t4018-diff-funcname: add cpp xfuncname pattern to syntax test

2009-05-06T05:49:02Z

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

Merge branch 'mk/maint-apply-swap' into maint

2009-05-03T22:02:52Z

* mk/maint-apply-swap: tests: make test-apply-criss-cross-rename more robust builtin-apply: keep information about files to be deleted tests: test applying criss-cross rename patch