aboutsummaryrefslogtreecommitdiffstats
path: root/t/t3906-stash-submodule.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t3906-stash-submodule.sh')
-rwxr-xr-xt/t3906-stash-submodule.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/t/t3906-stash-submodule.sh b/t/t3906-stash-submodule.sh
index 6a7e801ca0..a52e53dd2d 100755
--- a/t/t3906-stash-submodule.sh
+++ b/t/t3906-stash-submodule.sh
@@ -8,7 +8,12 @@ test_description='stash can handle submodules'
git_stash () {
git status -su >expect &&
ls -1pR * >>expect &&
- git read-tree -u -m "$1" &&
+ may_only_be_test_must_fail "$2" &&
+ $2 git read-tree -u -m "$1" &&
+ if test -n "$2"
+ then
+ return
+ fi &&
git stash &&
git status -su >actual &&
ls -1pR * >>actual &&