Merge branch 'maint'

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

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 48fa5160045d0bb2c14d034422b2ee5170889ec5..cb1ca973aa16d82b3c52cc2b7834d977887567a2 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -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)