t3430: test clean-up
Remove unnecessary test_tick etc... Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Jun 1, 2018 at 17:46 UTC
0c5a779c67d8c21579525e2a89c42b0fc7236a2b
1 file changed
+2
-3
t/t3430-rebase-merges.sh
+2
-3
@@ -70,7 +70,6 @@ test_expect_success 'create completely different structure' '
70
merge -C H second
71
merge onebranch # Merge the topic branch '\''onebranch'\''
72
EOF
73
- cp script-from-scratch script-from-scratch-orig &&
73
test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
74
test_tick &&
75
git rebase -i -r A &&
@@ -244,17 +243,17 @@ test_expect_success 'refuse to merge ancestors of HEAD' '
243
244
test_expect_success 'labels that are object IDs are rewritten' '
245
git checkout -b third B &&
247
- test_tick &&
246
test_commit I &&
247
third=$(git rev-parse HEAD) &&
248
git checkout -b labels master &&
249
git merge --no-commit third &&
250
test_tick &&
251
git commit -m "Merge commit '\''$third'\'' into labels" &&
254
- cp script-from-scratch-orig script-from-scratch &&
252
+ echo noop >script-from-scratch &&
253
test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
254
test_tick &&
255
git rebase -i -r A &&
256
+ grep "^label $third-" .git/ORIGINAL-TODO &&
257
! grep "^label $third$" .git/ORIGINAL-TODO
258
'
259