blob: f78945ed8e8fe5fea3c2656460a120363c546185 (
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
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
#!/bin/sh
#
# Copyright (c) 2007 David Symonds
test_description='git checkout from subdirectories'
. ./test-lib.sh
test_expect_success setup '
echo "base" > file0 &&
git add file0 &&
mkdir dir1 &&
echo "hello" > dir1/file1 &&
git add dir1/file1 &&
mkdir dir2 &&
echo "bonjour" > dir2/file2 &&
git add dir2/file2 &&
test_tick &&
git commit -m "populate tree"
'
test_expect_success 'remove and restore with relative path' '
(
cd dir1 &&
rm ../file0 &&
git checkout HEAD -- ../file0 &&
test "base" = "$(cat ../file0)" &&
rm ../dir2/file2 &&
git checkout HEAD -- ../dir2/file2 &&
test "bonjour" = "$(cat ../dir2/file2)" &&
rm ../file0 ./file1 &&
git checkout HEAD -- .. &&
test "base" = "$(cat ../file0)" &&
test "hello" = "$(cat file1)"
)
'
test_expect_success 'checkout with empty prefix' '
rm file0 &&
git checkout HEAD -- file0 &&
test "base" = "$(cat file0)"
'
test_expect_success 'checkout with simple prefix' '
rm dir1/file1 &&
git checkout HEAD -- dir1 &&
test "hello" = "$(cat dir1/file1)" &&
rm dir1/file1 &&
git checkout HEAD -- dir1/file1 &&
test "hello" = "$(cat dir1/file1)"
'
# This is not expected to work as ls-files was not designed
# to deal with such. Enable it when ls-files is updated.
: test_expect_success 'checkout with complex relative path' '
rm file1 &&
git checkout HEAD -- ../dir1/../dir1/file1 && test -f ./file1
'
test_expect_failure 'relative path outside tree should fail' \
'git checkout HEAD -- ../../Makefile'
test_expect_failure 'incorrect relative path to file should fail (1)' \
'git checkout HEAD -- ../file0'
test_expect_failure 'incorrect relative path should fail (2)' \
'( cd dir1 && git checkout HEAD -- ./file0 )'
test_expect_failure 'incorrect relative path should fail (3)' \
'( cd dir1 && git checkout HEAD -- ../../file0 )'
test_done
|
