]> git.ipfire.org Git - thirdparty/git.git/blame - t/t2016-checkout-patch.sh
help: make sure local html page exists before calling external processes
[thirdparty/git.git] / t / t2016-checkout-patch.sh
CommitLineData
4f353658
TR
1#!/bin/sh
2
3test_description='git checkout --patch'
4
5. ./lib-patch-mode.sh
6
f2f7b6a5 7test_expect_success PERL 'setup' '
4f353658
TR
8 mkdir dir &&
9 echo parent > dir/foo &&
10 echo dummy > bar &&
11 git add bar dir/foo &&
12 git commit -m initial &&
13 test_tick &&
14 test_commit second dir/foo head &&
15 set_and_save_state bar bar_work bar_index &&
16 save_head
17'
18
19# note: bar sorts before dir/foo, so the first 'n' is always to skip 'bar'
20
35166b1f
DL
21# NEEDSWORK: Since the builtin add-p is used when $GIT_TEST_ADD_I_USE_BUILTIN
22# is given, we should replace the PERL prerequisite with an ADD_I prerequisite
23# which first checks if $GIT_TEST_ADD_I_USE_BUILTIN is defined before checking
24# PERL.
f2f7b6a5 25test_expect_success PERL 'saying "n" does nothing' '
4f353658 26 set_and_save_state dir/foo work head &&
0590ff26 27 test_write_lines n n | git checkout -p &&
4f353658
TR
28 verify_saved_state bar &&
29 verify_saved_state dir/foo
30'
31
f2f7b6a5 32test_expect_success PERL 'git checkout -p' '
0590ff26 33 test_write_lines n y | git checkout -p &&
4f353658
TR
34 verify_saved_state bar &&
35 verify_state dir/foo head head
36'
37
f2f7b6a5 38test_expect_success PERL 'git checkout -p with staged changes' '
a48fcd83 39 set_state dir/foo work index &&
0590ff26 40 test_write_lines n y | git checkout -p &&
4f353658
TR
41 verify_saved_state bar &&
42 verify_state dir/foo index index
43'
44
f2f7b6a5 45test_expect_success PERL 'git checkout -p HEAD with NO staged changes: abort' '
4f353658 46 set_and_save_state dir/foo work head &&
0590ff26 47 test_write_lines n y n | git checkout -p HEAD &&
4f353658
TR
48 verify_saved_state bar &&
49 verify_saved_state dir/foo
50'
51
f2f7b6a5 52test_expect_success PERL 'git checkout -p HEAD with NO staged changes: apply' '
0590ff26 53 test_write_lines n y y | git checkout -p HEAD &&
4f353658
TR
54 verify_saved_state bar &&
55 verify_state dir/foo head head
56'
57
f2f7b6a5 58test_expect_success PERL 'git checkout -p HEAD with change already staged' '
a814615a 59 set_state dir/foo index index &&
4f353658 60 # the third n is to get out in case it mistakenly does not apply
0590ff26 61 test_write_lines n y n | git checkout -p HEAD &&
4f353658
TR
62 verify_saved_state bar &&
63 verify_state dir/foo head head
64'
65
5602b500
DL
66test_expect_success PERL 'git checkout -p HEAD^...' '
67 # the third n is to get out in case it mistakenly does not apply
68 test_write_lines n y n | git checkout -p HEAD^... &&
69 verify_saved_state bar &&
70 verify_state dir/foo parent parent
71'
72
f2f7b6a5 73test_expect_success PERL 'git checkout -p HEAD^' '
4f353658 74 # the third n is to get out in case it mistakenly does not apply
0590ff26 75 test_write_lines n y n | git checkout -p HEAD^ &&
4f353658
TR
76 verify_saved_state bar &&
77 verify_state dir/foo parent parent
78'
79
f2f7b6a5 80test_expect_success PERL 'git checkout -p handles deletion' '
e1327ed5
JK
81 set_state dir/foo work index &&
82 rm dir/foo &&
0590ff26 83 test_write_lines n y | git checkout -p &&
e1327ed5
JK
84 verify_saved_state bar &&
85 verify_state dir/foo index index
86'
87
4f353658
TR
88# The idea in the rest is that bar sorts first, so we always say 'y'
89# first and if the path limiter fails it'll apply to bar instead of
90# dir/foo. There's always an extra 'n' to reject edits to dir/foo in
91# the failure case (and thus get out of the loop).
92
f2f7b6a5 93test_expect_success PERL 'path limiting works: dir' '
4f353658 94 set_state dir/foo work head &&
0590ff26 95 test_write_lines y n | git checkout -p dir &&
4f353658
TR
96 verify_saved_state bar &&
97 verify_state dir/foo head head
98'
99
f2f7b6a5 100test_expect_success PERL 'path limiting works: -- dir' '
4f353658 101 set_state dir/foo work head &&
0590ff26 102 test_write_lines y n | git checkout -p -- dir &&
4f353658
TR
103 verify_saved_state bar &&
104 verify_state dir/foo head head
105'
106
f2f7b6a5 107test_expect_success PERL 'path limiting works: HEAD^ -- dir' '
4f353658 108 # the third n is to get out in case it mistakenly does not apply
0590ff26 109 test_write_lines y n n | git checkout -p HEAD^ -- dir &&
4f353658
TR
110 verify_saved_state bar &&
111 verify_state dir/foo parent parent
112'
113
f2f7b6a5 114test_expect_success PERL 'path limiting works: foo inside dir' '
4f353658
TR
115 set_state dir/foo work head &&
116 # the third n is to get out in case it mistakenly does not apply
0590ff26 117 test_write_lines y n n | (cd dir && git checkout -p foo) &&
4f353658
TR
118 verify_saved_state bar &&
119 verify_state dir/foo head head
120'
121
f2f7b6a5 122test_expect_success PERL 'none of this moved HEAD' '
4f353658
TR
123 verify_saved_head
124'
125
5c29f19c
JS
126test_expect_success PERL 'empty tree can be handled' '
127 test_when_finished "git reset --hard" &&
128 git checkout -p $(test_oid empty_tree) --
129'
130
4f353658 131test_done