user/sven/git.git/t, branch v1.7.3.5

t9001: Fix test prerequisites

2010-12-29T21:39:05Z

Add in missing Perl prerequisites for new tests of send-email. Signed-off-by: Robin H. Johnson Signed-off-by: Junio C Hamano

Merge branch 'jk/commit-die-on-bogus-ident' into maint

2010-12-28T21:45:12Z

* jk/commit-die-on-bogus-ident: commit: die before asking to edit the log message ident: die on bogus date format

Merge branch 'ks/blame-worktree-textconv-cached' into maint

2010-12-28T21:44:58Z

* ks/blame-worktree-textconv-cached: fill_textconv(): Don't get/put cache if sha1 is not valid t/t8006: Demonstrate blame is broken when cachetextconv is on

Merge branch 'jc/maint-rebase-rewrite-last-skip' into maint

2010-12-28T21:43:10Z

* jc/maint-rebase-rewrite-last-skip: rebase --skip: correctly wrap-up when skipping the last patch

Merge branch 'jc/maint-am-abort-safely' into maint

2010-12-28T21:42:55Z

* jc/maint-am-abort-safely: am --abort: keep unrelated commits since the last failure and warn

Fix false positives in t3404 due to SHELL=/bin/false

2010-12-28T19:22:16Z

If the user's shell in NSS passwd is /bin/false (eg as found during Gentoo's package building), the git-rebase exec tests will fail, because they call $SHELL around the command, and in the existing testcase, $SHELL was not being cleared sufficently. This lead to false positive failures of t3404 on systems where the package build user was locked down as noted above. Signed-off-by: "Robin H. Johnson" X-Gentoo-Bug: 349083 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=349083 Signed-off-by: Junio C Hamano

test-lib.sh/test_decode_color(): use octal not hex in awk script

2010-12-23T03:46:52Z

POSIX awk seems to explicitly not support hexadecimal escape sequences. From http://pubs.opengroup.org/onlinepubs/009695399/: Regular expressions in awk have been extended somewhat... One sequence that is not supported is hexadecimal value escapes beginning with '\x'. This affects the awk on IRIX 6.5, and causes t4015.56 to fail. Use octal instead. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

rebase --skip: correctly wrap-up when skipping the last patch

2010-12-23T00:50:28Z

When "rebase --skip" is used to skip the last patch in the series, the code to wrap up the rewrite by copying the notes from old to new commits and also by running the post-rewrite hook was bypassed. Signed-off-by: Junio C Hamano

t0050: fix printf format strings for portability

2010-12-21T21:26:32Z

Unlike bash and ksh, dash passes through hexadecimal \xcc escapes. So when run with dash, these tests *pass* (since '\xcc' is a perfectly reasonable filename) but they are not testing what was intended. Use octal escapes instead, in the spirit of v1.6.1-rc1~55^2 (2008-11-09). Reported-by: Ramsay Jones Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

t3419-*.sh: Fix arithmetic expansion syntax error

2010-12-21T20:26:21Z

Some shells, for example dash versions older than 0.5.4, need to spell a variable reference as '$N' rather than 'N' in an arithmetic expansion. In order to avoid the syntax error, we change the offending variable reference from 'i' to '$i' in function scramble. There is nothing bash specific to this test script (and we shouldn't have any bash dependent test). Fix its shebang line. Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano