summaryrefslogtreecommitdiff
path: root/t/t3906-stash-submodule.sh
blob: b93d1d74da7b41c51ba483fc015ac56f13799341 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
#!/bin/sh
 
test_description='stash 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"
 
setup_basic () {
	test_when_finished "rm -rf main sub" &&
	git init sub &&
	(
		cd sub &&
		test_commit sub_file
	) &&
	git init main &&
	(
		cd main &&
		git submodule add ../sub &&
		test_commit main_file
	)
}
 
test_expect_success 'stash push with submodule.recurse=true preserves dirty submodule worktree' '
	setup_basic &&
	(
		cd main &&
		git config submodule.recurse true &&
		echo "x" >main_file.t &&
		echo "y" >sub/sub_file.t &&
		git stash push &&
		test_must_fail git -C sub diff --quiet
	)
'
 
test_expect_success 'stash push and pop with submodule.recurse=true preserves dirty submodule worktree' '
	setup_basic &&
	(
		cd main &&
		git config submodule.recurse true &&
		echo "x" >main_file.t &&
		echo "y" >sub/sub_file.t &&
		git stash push &&
		git stash pop &&
		test_must_fail git -C sub diff --quiet
	)
'
 
test_done