Merge branch 'maint' to sync with 1.7.2.2

diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh
index 8db4fc8b10893b95b4fd8c44de4bbf78d639d6d9..568a6f2b69ab5003c00f206806c3fe6289f63a98 100755 (executable)
--- a/t/t7811-grep-open.sh
+++ b/t/t7811-grep-open.sh
@@ -84,10 +84,11 @@ test_expect_success 'git grep -O --no-index' '
 '
 
 test_expect_success 'setup: fake "less"' '
-       cat >less <<-\EOF
+       cat >less <<-\EOF &&
        #!/bin/sh
        printf "%s\n" "$@" >actual
        EOF
+       chmod +x less
 '
 
 test_expect_success 'git grep -O jumps to line in less' '
@@ -108,11 +109,6 @@ test_expect_success 'git grep -O jumps to line in less' '
 
 test_expect_success 'modified file' '
        rm -f actual &&
-       cat >less <<-\EOF &&
-       #!/bin/sh
-       printf "%s\n" "$@" >actual
-       EOF
-       chmod +x $less &&
        cat >expect <<-\EOF &&
        +/*enum grep_pat_token
        grep.h
@@ -129,6 +125,21 @@ test_expect_success 'modified file' '
        test_cmp empty out
 '
 
+test_config() {
+       git config "$1" "$2" &&
+       test_when_finished "git config --unset $1"
+}
+
+test_expect_success 'copes with color settings' '
+       rm -f actual &&
+       echo grep.h >expect &&
+       test_config color.grep always &&
+       test_config color.grep.filename yellow &&
+       test_config color.grep.separator green &&
+       git grep -O'\''printf "%s\n" >actual'\'' GREP_AND &&
+       test_cmp expect actual
+'
+
 test_expect_success 'run from subdir' '
        rm -f actual &&
        echo grep.c >expect &&