t7102 (reset): don't hardcode SHA-1 in expected outputs
Take the expected SHA-1 digest in a variable, and use it instead of hardcoding when checking the result. Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Alexey Shumkin committed
Jan 24, 2013 at 13:10 UTC
8b66f7857d470f50a2a24d9b12ed8eec2781cad2
1 file changed
+21
-20
t/t7102-reset.sh
+21
-20
@@ -28,7 +28,8 @@ test_expect_success 'creating initial files and commits' '
28
29
echo "1st line 2nd file" >secondfile &&
30
echo "2nd line 2nd file" >>secondfile &&
31
- git commit -a -m "modify 2nd file"
31
+ git commit -a -m "modify 2nd file" &&
32
+ head5=$(git rev-parse --verify HEAD)
33
'
34
# git log --pretty=oneline # to see those SHA1 involved
35
@@ -56,7 +57,7 @@ test_expect_success 'giving a non existing revision should fail' '
57
test_must_fail git reset --mixed aaaaaa &&
58
test_must_fail git reset --soft aaaaaa &&
59
test_must_fail git reset --hard aaaaaa &&
59
- check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
60
+ check_changes $head5
61
'
62
63
test_expect_success 'reset --soft with unmerged index should fail' '
@@ -74,7 +75,7 @@ test_expect_success \
75
test_must_fail git reset --hard -- first &&
76
test_must_fail git reset --soft HEAD^ -- first &&
77
test_must_fail git reset --hard HEAD^ -- first &&
77
- check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
78
+ check_changes $head5
79
'
80
81
test_expect_success 'giving unrecognized options should fail' '
@@ -86,7 +87,7 @@ test_expect_success 'giving unrecognized options should fail' '
87
test_must_fail git reset --soft -o &&
88
test_must_fail git reset --hard --other &&
89
test_must_fail git reset --hard -o &&
89
- check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
90
+ check_changes $head5
91
'
92
93
test_expect_success \
@@ -110,7 +111,7 @@ test_expect_success \
111
112
git checkout master &&
113
git branch -D branch1 branch2 &&
113
- check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
114
+ check_changes $head5
115
'
116
117
test_expect_success \
@@ -133,27 +134,27 @@ test_expect_success \
134
135
git checkout master &&
136
git branch -D branch3 branch4 &&
136
- check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
137
+ check_changes $head5
138
'
139
140
test_expect_success \
141
'resetting to HEAD with no changes should succeed and do nothing' '
142
git reset --hard &&
142
- check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
143
+ check_changes $head5 &&
144
git reset --hard HEAD &&
144
- check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
145
+ check_changes $head5 &&
146
git reset --soft &&
146
- check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
147
+ check_changes $head5 &&
148
git reset --soft HEAD &&
148
- check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
149
+ check_changes $head5 &&
150
git reset --mixed &&
150
- check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
151
+ check_changes $head5 &&
152
git reset --mixed HEAD &&
152
- check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
153
+ check_changes $head5 &&
154
git reset &&
154
- check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
155
+ check_changes $head5 &&
156
git reset HEAD &&
156
- check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
157
+ check_changes $head5
158
'
159
160
>.diff_expect
@@ -176,7 +177,7 @@ test_expect_success '--soft reset only should show changes in diff --cached' '
177
git reset --soft HEAD^ &&
178
check_changes d1a4bc3abce4829628ae2dcb0d60ef3d1a78b1c4 &&
179
test "$(git rev-parse ORIG_HEAD)" = \
179
- 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
180
+ $head5
181
'
182
183
>.diff_expect
@@ -193,7 +194,7 @@ test_expect_success \
194
git commit -a -C ORIG_HEAD &&
195
check_changes 3d3b7be011a58ca0c179ae45d94e6c83c0b0cd0d &&
196
test "$(git rev-parse ORIG_HEAD)" = \
196
- 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
197
+ $head5
198
'
199
200
>.diff_expect
@@ -303,7 +304,7 @@ test_expect_success 'redoing the last two commits should succeed' '
304
echo "1st line 2nd file" >secondfile &&
305
echo "2nd line 2nd file" >>secondfile &&
306
git commit -a -m "modify 2nd file" &&
306
- check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
307
+ check_changes $head5
308
'
309
310
>.diff_expect
@@ -341,15 +342,15 @@ EOF
342
test_expect_success \
343
'--hard reset to ORIG_HEAD should clear a fast-forward merge' '
344
git reset --hard HEAD^ &&
344
- check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
345
+ check_changes $head5 &&
346
347
git pull . branch1 &&
348
git reset --hard ORIG_HEAD &&
348
- check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
349
+ check_changes $head5 &&
350
351
git checkout master &&
352
git branch -D branch1 branch2 &&
352
- check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
353
+ check_changes $head5
354
'
355
356
cat > expect << EOF