summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-06-04 21:39:50 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-04 21:39:50 +0900
commite66e8f9be8af90671b85a758b62610bd1162de2d (patch)
tree9e38a6b4a5b6a304f907e830f172cb2d791f0a51 /t
parentMerge branch 'bw/refspec-api' (diff)
parentt3430: test clean-up (diff)
downloadtgif-e66e8f9be8af90671b85a758b62610bd1162de2d.tar.xz
Merge branch 'bc/t3430-fixup'
Test fix. * bc/t3430-fixup: t3430: test clean-up
Diffstat (limited to 't')
-rwxr-xr-xt/t3430-rebase-merges.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
index 2608e5483d..78f7c99580 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 &&
@@ -316,17 +315,17 @@ test_expect_success 'A root commit can be a cousin, treat it that way' '
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
'