Merge branch 'ph/color-test'

* ph/color-test:
  Support a --quiet option in the test-suite.
  Add some fancy colors in the test library when terminal supports it.

diff --git a/fast-import.c b/fast-import.c
index 6f888f64767ee78ef198180c6e628ddb60e09191..f93d7d6c9bf2db021ceb65766da87af32aecc1d1 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -1616,6 +1616,7 @@ static void cmd_data(struct strbuf *sb)
                char *term = xstrdup(command_buf.buf + 5 + 2);
                size_t term_len = command_buf.len - 5 - 2;
 
+               strbuf_detach(&command_buf, NULL);
                for (;;) {
                        if (strbuf_getline(&command_buf, stdin, '\n') == EOF)
                                die("EOF in data (terminator '%s' not found)", term);

diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit
index 18b87309f65be23794b87260e08c547f5deeefce..a19279b3e41653b519b8c3b266bc7845f3648c4b 100644 (file)
--- a/templates/hooks--pre-commit
+++ b/templates/hooks--pre-commit
@@ -58,7 +58,7 @@ perl -e '
            if (/\s$/) {
                bad_line("trailing whitespace", $_);
            }
-           if (/^\s*   /) {
+           if (/^\s* \t/) {
                bad_line("indent SP followed by a TAB", $_);
            }
            if (/^(?:[<>=]){7}/) {