Merge branch 'ms/submodule-foreach-fix' into maint

diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
index 77729ac4aa1873a7e74b59975910ca33a00899d8..6b2aa917e11871eb403c8c79725b1e1944f8d29f 100755 (executable)
--- a/t/t7407-submodule-foreach.sh
+++ b/t/t7407-submodule-foreach.sh
@@ -411,4 +411,21 @@ test_expect_success 'multi-argument command passed to foreach is not shell-evalu
        test_cmp expected actual
 '
 
+test_expect_success 'option-like arguments passed to foreach commands are not lost' '
+       (
+               cd super &&
+               git submodule foreach "echo be --quiet" > ../expected &&
+               git submodule foreach echo be --quiet > ../actual
+       ) &&
+       grep -sq -e "--quiet" expected &&
+       test_cmp expected actual
+'
+
+test_expect_success 'option-like arguments passed to foreach recurse correctly' '
+       git -C clone2 submodule foreach --recursive "echo be --an-option" >expect &&
+       git -C clone2 submodule foreach --recursive echo be --an-option >actual &&
+       grep -e "--an-option" expect &&
+       test_cmp expect actual
+'
+
 test_done