t3508 (cherry-pick): futureproof against unmerged files
Each of the tests in t3508 begins by navigating to a sane state: git checkout master && git reset --hard $commit If a previous test left unmerged files around, they are untouched and the checkout fails, causing later tests to fail, too. This is not a problem in practice because no test except the final one produces unmerged files. But as a futureproofing measure, it is still best to avoid the problem with 'checkout -f'. In particular, this is needed for new tests to be added to the end of the script. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder committed
Jun 14, 2010 at 00:28 UTC
18c8ff46104302ea30e879a0f2cb5eefb94df1a4
1 file changed
+7
-7
t/t3508-cherry-pick-many-commits.sh
+7
-7
@@ -23,7 +23,7 @@ test_expect_success setup '
23
'
24
25
test_expect_success 'cherry-pick first..fourth works' '
26
- git checkout master &&
26
+ git checkout -f master &&
27
git reset --hard first &&
28
test_tick &&
29
git cherry-pick first..fourth &&
@@ -33,7 +33,7 @@ test_expect_success 'cherry-pick first..fourth works' '
33
'
34
35
test_expect_success 'cherry-pick --ff first..fourth works' '
36
- git checkout master &&
36
+ git checkout -f master &&
37
git reset --hard first &&
38
test_tick &&
39
git cherry-pick --ff first..fourth &&
@@ -43,7 +43,7 @@ test_expect_success 'cherry-pick --ff first..fourth works' '
43
'
44
45
test_expect_success 'cherry-pick -n first..fourth works' '
46
- git checkout master &&
46
+ git checkout -f master &&
47
git reset --hard first &&
48
test_tick &&
49
git cherry-pick -n first..fourth &&
@@ -53,7 +53,7 @@ test_expect_success 'cherry-pick -n first..fourth works' '
53
'
54
55
test_expect_success 'revert first..fourth works' '
56
- git checkout master &&
56
+ git checkout -f master &&
57
git reset --hard fourth &&
58
test_tick &&
59
git revert first..fourth &&
@@ -63,7 +63,7 @@ test_expect_success 'revert first..fourth works' '
63
'
64
65
test_expect_success 'revert ^first fourth works' '
66
- git checkout master &&
66
+ git checkout -f master &&
67
git reset --hard fourth &&
68
test_tick &&
69
git revert ^first fourth &&
@@ -73,7 +73,7 @@ test_expect_success 'revert ^first fourth works' '
73
'
74
75
test_expect_success 'revert fourth fourth~1 fourth~2 works' '
76
- git checkout master &&
76
+ git checkout -f master &&
77
git reset --hard fourth &&
78
test_tick &&
79
git revert fourth fourth~1 fourth~2 &&
@@ -83,7 +83,7 @@ test_expect_success 'revert fourth fourth~1 fourth~2 works' '
83
'
84
85
test_expect_failure 'cherry-pick -3 fourth works' '
86
- git checkout master &&
86
+ git checkout -f master &&
87
git reset --hard first &&
88
test_tick &&
89
git cherry-pick -3 fourth &&