Merge branch 'jk/test-httpd-config-nosystem'
[git/git-svn.git] / t / t3906-stash-submodule.sh
blobd7219d6f8f18868ad901e522715a8195c3d58940
1 #!/bin/sh
3 test_description='stash apply can handle submodules'
5 . ./test-lib.sh
6 . "$TEST_DIRECTORY"/lib-submodule-update.sh
8 git_stash () {
9 git status -su >expect &&
10 ls -1pR * >>expect &&
11 git read-tree -u -m "$1" &&
12 git stash &&
13 git status -su >actual &&
14 ls -1pR * >>actual &&
15 test_cmp expect actual &&
16 git stash apply
19 KNOWN_FAILURE_STASH_DOES_IGNORE_SUBMODULE_CHANGES=1
20 KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1
21 KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
22 test_submodule_switch "git_stash"
24 test_done