diff options
| -rwxr-xr-x | git-submodule.sh | 6 | ||||
| -rwxr-xr-x | t/t7407-submodule-foreach.sh | 18 |
2 files changed, 23 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index cfd5aa6049..87c9452c8a 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -304,6 +304,10 @@ cmd_foreach() toplevel=$(pwd) + # dup stdin so that it can be restored when running the external + # command in the subshell (and a recursive call to this function) + exec 3<&0 + module_list | while read mode sha1 stage path do @@ -320,7 +324,7 @@ cmd_foreach() then cmd_foreach "--recursive" "$@" fi - ) || + ) <&3 3<&- || die "$(eval_gettext "Stopping at '\$path'; script returned non-zero status.")" fi done diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh index ae3bd18a5e..be745fb23f 100755 --- a/t/t7407-submodule-foreach.sh +++ b/t/t7407-submodule-foreach.sh @@ -292,4 +292,22 @@ test_expect_success 'use "update --recursive nested1" to checkout all submodules ) ' +test_expect_success 'command passed to foreach retains notion of stdin' ' + ( + cd super && + git submodule foreach echo success >../expected && + yes | git submodule foreach "read y && test \"x\$y\" = xy && echo success" >../actual + ) && + test_cmp expected actual +' + +test_expect_success 'command passed to foreach --recursive retains notion of stdin' ' + ( + cd clone2 && + git submodule foreach --recursive echo success >../expected && + yes | git submodule foreach --recursive "read y && test \"x\$y\" = xy && echo success" >../actual + ) && + test_cmp expected actual +' + test_done |