You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
25 lines
535 B
25 lines
535 B
11 years ago
|
#!/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
|