Squashed 'third_party/git/' content from commit cb71568594
git-subtree-dir: third_party/git git-subtree-split: cb715685942260375e1eb8153b0768a376e4ece7
This commit is contained in:
commit
1b593e1ea4
3629 changed files with 1139935 additions and 0 deletions
24
t/t3906-stash-submodule.sh
Executable file
24
t/t3906-stash-submodule.sh
Executable file
|
|
@ -0,0 +1,24 @@
|
|||
#!/bin/sh
|
||||
|
||||
test_description='stash apply can handle submodules'
|
||||
|
||||
. ./test-lib.sh
|
||||
. "$TEST_DIRECTORY"/lib-submodule-update.sh
|
||||
|
||||
git_stash () {
|
||||
git status -su >expect &&
|
||||
ls -1pR * >>expect &&
|
||||
git read-tree -u -m "$1" &&
|
||||
git stash &&
|
||||
git status -su >actual &&
|
||||
ls -1pR * >>actual &&
|
||||
test_cmp expect actual &&
|
||||
git stash apply
|
||||
}
|
||||
|
||||
KNOWN_FAILURE_STASH_DOES_IGNORE_SUBMODULE_CHANGES=1
|
||||
KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1
|
||||
KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
|
||||
test_submodule_switch "git_stash"
|
||||
|
||||
test_done
|
||||
Loading…
Add table
Add a link
Reference in a new issue