grep -O: allow optional argument specifying the pager (or editor)

diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh
index fcfc56ea61d708a95a85624440fe56b52fedef62..8db4fc8b10893b95b4fd8c44de4bbf78d639d6d9 100755 (executable)
--- a/t/t7811-grep-open.sh
+++ b/t/t7811-grep-open.sh
@@ -99,7 +99,11 @@ test_expect_success 'git grep -O jumps to line in less' '
 
        GIT_PAGER=./less git grep -O GREP_PATTERN >out &&
        test_cmp expect actual &&
-       test_cmp empty out
+       test_cmp empty out &&
+
+       git grep -O./less GREP_PATTERN >out2 &&
+       test_cmp expect actual &&
+       test_cmp empty out2
 '
 
 test_expect_success 'modified file' '
@@ -135,8 +139,7 @@ test_expect_success 'run from subdir' '
                export GIT_PAGER &&
                GIT_PAGER='\''printf "%s\n" >../args'\'' &&
                git grep -O "enum grep_pat_token" >../out &&
-               GIT_PAGER="pwd >../dir; :" &&
-               git grep -O "enum grep_pat_token" >../out2
+               git grep -O"pwd >../dir; :" "enum grep_pat_token" >../out2
        ) &&
        case $(cat dir) in
        *subdir)