diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2018-06-01 17:46:39 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-06-04 11:21:28 +0900 |
| commit | 0c5a779c67d8c21579525e2a89c42b0fc7236a2b (patch) | |
| tree | b3b78794874b1ee4d90c86a263d8c560b499c093 | |
| parent | sequencer: ensure labels that are object IDs are rewritten (diff) | |
| download | tgif-0c5a779c67d8c21579525e2a89c42b0fc7236a2b.tar.xz | |
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>
| -rwxr-xr-x | t/t3430-rebase-merges.sh | 5 |
1 files changed, 2 insertions, 3 deletions
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 ' |