summaryrefslogtreecommitdiff
path: root/t/t2021-checkout-overwrite.sh
blob: 70d69263e6821514ada6ace0ba7846360585f32d (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
65
66
#!/bin/sh
 
test_description='checkout must not overwrite an untracked objects'
. ./test-lib.sh
 
test_expect_success 'setup' '
 
	mkdir -p a/b/c &&
	>a/b/c/d &&
	git add -A &&
	git commit -m base &&
	git tag start
'
 
test_expect_success 'create a commit where dir a/b changed to file' '
 
	git checkout -b file &&
	rm -rf a/b &&
	>a/b &&
	git add -A &&
	git commit -m "dir to file"
'
 
test_expect_success 'checkout commit with dir must not remove untracked a/b' '
 
	git rm --cached a/b &&
	git commit -m "un-track the file" &&
	test_must_fail git checkout start &&
	test -f a/b
'
 
test_expect_success 'create a commit where dir a/b changed to symlink' '
 
	rm -rf a/b &&	# cleanup if previous test failed
	git checkout -f -b symlink start &&
	rm -rf a/b &&
	git add -A &&
	test_ln_s_add foo a/b &&
	git commit -m "dir to symlink"
'
 
test_expect_success 'checkout commit with dir must not remove untracked a/b' '
 
	git rm --cached a/b &&
	git commit -m "un-track the symlink" &&
	test_must_fail git checkout start
'
 
test_expect_success SYMLINKS 'the symlink remained' '
 
	test -h a/b
'
 
test_expect_success SYMLINKS 'checkout -f must not follow symlinks when removing entries' '
	git checkout -f start &&
	mkdir dir &&
	>dir/f &&
	git add dir/f &&
	git commit -m "add dir/f" &&
	mv dir untracked &&
	ln -s untracked dir &&
	git checkout -f HEAD~ &&
	test_path_is_file untracked/f
'
 
test_done