kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
brian m. carlson 2018-06-01 17:46:39 +00:00 committed by Junio C Hamano
parent 5971b0836e
commit 0c5a779c67
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
t/t3430-rebase-merges.sh
View File

@ -70,7 +70,6 @@ test_expect_success 'create completely different structure' '
merge -C H second merge -C H second
merge onebranch # Merge the topic branch '\''onebranch'\'' merge onebranch # Merge the topic branch '\''onebranch'\''
EOF EOF
cp script-from-scratch script-from-scratch-orig &&
test_config sequence.editor \""$PWD"/replace-editor.sh\" && test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
test_tick && test_tick &&
git rebase -i -r A && git rebase -i -r A &&
@ -244,17 +243,17 @@ test_expect_success 'refuse to merge ancestors of HEAD' '


test_expect_success 'labels that are object IDs are rewritten' ' test_expect_success 'labels that are object IDs are rewritten' '
git checkout -b third B && git checkout -b third B &&
test_tick &&
test_commit I && test_commit I &&
third=$(git rev-parse HEAD) && third=$(git rev-parse HEAD) &&
git checkout -b labels master && git checkout -b labels master &&
git merge --no-commit third && git merge --no-commit third &&
test_tick && test_tick &&
git commit -m "Merge commit '\''$third'\'' into labels" && git commit -m "Merge commit '\''$third'\'' into labels" &&
cp script-from-scratch-orig script-from-scratch && echo noop >script-from-scratch &&
test_config sequence.editor \""$PWD"/replace-editor.sh\" && test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
test_tick && test_tick &&
git rebase -i -r A && git rebase -i -r A &&
grep "^label $third-" .git/ORIGINAL-TODO &&
! grep "^label $third$" .git/ORIGINAL-TODO ! grep "^label $third$" .git/ORIGINAL-TODO
' '