Merge branch 'jc/rerere'

diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 947b690fd7fcaae6f2584b0752adfecfc0c1af89..6ea7ac4c418d7ace719910c1730217a1ffe7532f 100755 (executable)
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -447,4 +447,13 @@ test_expect_success TTY 'external command pagers override sub-commands' '
        test_cmp expect actual
 '
 
+test_expect_success 'command with underscores does not complain' '
+       write_script git-under_score <<-\EOF &&
+       echo ok
+       EOF
+       git --exec-path=. under_score >actual 2>&1 &&
+       echo ok >expect &&
+       test_cmp expect actual
+'
+
 test_done