summaryrefslogtreecommitdiff
path: root/t/t3501-revert-cherry-pick.sh
blob: 753a6c972cda61d2da3d2ecf7bd9c231004d6ad0 (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
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
#!/bin/sh
 
test_description='test cherry-pick and revert with renames
 
  --
   + rename2: renames oops to opos
  +  rename1: renames oops to spoo
  +  added:   adds extra line to oops
  ++ initial: has lines in oops
 
'
 
. ./test-lib.sh
 
test_expect_success setup '
 
	for l in a b c d e f g h i j k l m n o
	do
		echo $l$l$l$l$l$l$l$l$l
	done >oops &&
 
	test_tick &&
	git add oops &&
	git commit -m initial &&
	git tag initial &&
 
	test_tick &&
	echo "Add extra line at the end" >>oops &&
	git commit -a -m added &&
	git tag added &&
 
	test_tick &&
	git mv oops spoo &&
	git commit -m rename1 &&
	git tag rename1 &&
 
	test_tick &&
	git checkout -b side initial &&
	git mv oops opos &&
	git commit -m rename2 &&
	git tag rename2
'
 
test_expect_success 'cherry-pick --nonsense' '
 
	pos=$(git rev-parse HEAD) &&
	git diff --exit-code HEAD &&
	test_must_fail git cherry-pick --nonsense 2>msg &&
	git diff --exit-code HEAD "$pos" &&
	grep '[Uu]sage:' msg
'
 
test_expect_success 'revert --nonsense' '
 
	pos=$(git rev-parse HEAD) &&
	git diff --exit-code HEAD &&
	test_must_fail git revert --nonsense 2>msg &&
	git diff --exit-code HEAD "$pos" &&
	grep '[Uu]sage:' msg
'
 
test_expect_success 'cherry-pick after renaming branch' '
 
	git checkout rename2 &&
	git cherry-pick added &&
	test $(git rev-parse HEAD^) = $(git rev-parse rename2) &&
	test -f opos &&
	grep "Add extra line at the end" opos &&
	git reflog -1 | grep cherry-pick
 
'
 
test_expect_success 'revert after renaming branch' '
 
	git checkout rename1 &&
	git revert added &&
	test $(git rev-parse HEAD^) = $(git rev-parse rename1) &&
	test -f spoo &&
	! grep "Add extra line at the end" spoo &&
	git reflog -1 | grep revert
 
'
 
test_expect_success 'cherry-pick on stat-dirty working tree' '
	git clone . copy &&
	(
		cd copy &&
		git checkout initial &&
		test-chmtime +40 oops &&
		git cherry-pick added
	)
'
 
test_expect_success C_LOCALE_OUTPUT 'revert forbidden on dirty working tree' '
 
	echo content >extra_file &&
	git add extra_file &&
	test_must_fail git revert HEAD 2>errors &&
	grep "Your local changes would be overwritten by " errors
 
'
 
test_done