]> git.ipfire.org Git - thirdparty/git.git/blob - t/t2072-restore-pathspec-file.sh
Merge branch 'hd/show-one-mergetag-fix' into maint
[thirdparty/git.git] / t / t2072-restore-pathspec-file.sh
1 #!/bin/sh
2
3 test_description='restore --pathspec-from-file'
4
5 . ./test-lib.sh
6
7 test_tick
8
9 test_expect_success setup '
10 test_commit file0 &&
11
12 echo 1 >fileA.t &&
13 echo 1 >fileB.t &&
14 echo 1 >fileC.t &&
15 echo 1 >fileD.t &&
16 git add fileA.t fileB.t fileC.t fileD.t &&
17 git commit -m "files 1" &&
18
19 echo 2 >fileA.t &&
20 echo 2 >fileB.t &&
21 echo 2 >fileC.t &&
22 echo 2 >fileD.t &&
23 git add fileA.t fileB.t fileC.t fileD.t &&
24 git commit -m "files 2" &&
25
26 git tag checkpoint
27 '
28
29 restore_checkpoint () {
30 git reset --hard checkpoint
31 }
32
33 verify_expect () {
34 git status --porcelain --untracked-files=no -- fileA.t fileB.t fileC.t fileD.t >actual &&
35 test_cmp expect actual
36 }
37
38 test_expect_success '--pathspec-from-file from stdin' '
39 restore_checkpoint &&
40
41 echo fileA.t | git restore --pathspec-from-file=- --source=HEAD^1 &&
42
43 cat >expect <<-\EOF &&
44 M fileA.t
45 EOF
46 verify_expect
47 '
48
49 test_expect_success '--pathspec-from-file from file' '
50 restore_checkpoint &&
51
52 echo fileA.t >list &&
53 git restore --pathspec-from-file=list --source=HEAD^1 &&
54
55 cat >expect <<-\EOF &&
56 M fileA.t
57 EOF
58 verify_expect
59 '
60
61 test_expect_success 'NUL delimiters' '
62 restore_checkpoint &&
63
64 printf "fileA.t\0fileB.t\0" | git restore --pathspec-from-file=- --pathspec-file-nul --source=HEAD^1 &&
65
66 cat >expect <<-\EOF &&
67 M fileA.t
68 M fileB.t
69 EOF
70 verify_expect
71 '
72
73 test_expect_success 'LF delimiters' '
74 restore_checkpoint &&
75
76 printf "fileA.t\nfileB.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
77
78 cat >expect <<-\EOF &&
79 M fileA.t
80 M fileB.t
81 EOF
82 verify_expect
83 '
84
85 test_expect_success 'no trailing delimiter' '
86 restore_checkpoint &&
87
88 printf "fileA.t\nfileB.t" | git restore --pathspec-from-file=- --source=HEAD^1 &&
89
90 cat >expect <<-\EOF &&
91 M fileA.t
92 M fileB.t
93 EOF
94 verify_expect
95 '
96
97 test_expect_success 'CRLF delimiters' '
98 restore_checkpoint &&
99
100 printf "fileA.t\r\nfileB.t\r\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
101
102 cat >expect <<-\EOF &&
103 M fileA.t
104 M fileB.t
105 EOF
106 verify_expect
107 '
108
109 test_expect_success 'quotes' '
110 restore_checkpoint &&
111
112 printf "\"file\\101.t\"" | git restore --pathspec-from-file=- --source=HEAD^1 &&
113
114 cat >expect <<-\EOF &&
115 M fileA.t
116 EOF
117 verify_expect
118 '
119
120 test_expect_success 'quotes not compatible with --pathspec-file-nul' '
121 restore_checkpoint &&
122
123 printf "\"file\\101.t\"" >list &&
124 test_must_fail git restore --pathspec-from-file=list --pathspec-file-nul --source=HEAD^1
125 '
126
127 test_expect_success 'only touches what was listed' '
128 restore_checkpoint &&
129
130 printf "fileB.t\nfileC.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
131
132 cat >expect <<-\EOF &&
133 M fileB.t
134 M fileC.t
135 EOF
136 verify_expect
137 '
138
139 test_done