Merge branch 'maint'

* maint:
  test-lib.sh/test_decode_color(): use octal not hex in awk script
This commit is contained in:
Junio C Hamano 2010-12-22 20:33:12 -08:00
commit 4e3a1b24ad

View File

@ -260,7 +260,7 @@ test_decode_color () {
if (n == 47) return "BWHITE";
}
{
while (match($0, /\x1b\[[0-9;]*m/) != 0) {
while (match($0, /\033\[[0-9;]*m/) != 0) {
printf "%s<", substr($0, 1, RSTART-1);
codes = substr($0, RSTART+2, RLENGTH-3);
if (length(codes) == 0)