From 0c5a779c67d8c21579525e2a89c42b0fc7236a2b Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Fri, 1 Jun 2018 17:46:39 +0000 Subject: t3430: test clean-up Remove unnecessary test_tick etc... Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- t/t3430-rebase-merges.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 't') diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh index 472ad9463c..9fc4648ff8 100755 --- a/t/t3430-rebase-merges.sh +++ b/t/t3430-rebase-merges.sh @@ -70,7 +70,6 @@ test_expect_success 'create completely different structure' ' merge -C H second merge onebranch # Merge the topic branch '\''onebranch'\'' EOF - cp script-from-scratch script-from-scratch-orig && test_config sequence.editor \""$PWD"/replace-editor.sh\" && test_tick && 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' ' git checkout -b third B && - test_tick && test_commit I && third=$(git rev-parse HEAD) && git checkout -b labels master && git merge --no-commit third && test_tick && 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_tick && git rebase -i -r A && + grep "^label $third-" .git/ORIGINAL-TODO && ! grep "^label $third$" .git/ORIGINAL-TODO ' -- cgit v1.2.3