diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2021-09-13 15:19:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-13 19:47:06 (GMT) |
| commit | e505f452d4e7d0d4b603b1332ad742e74a5d5374 (patch) | |
| tree | 50a53d4dc39f4db356c81fe5d79a456ff072af56 /t/t3407-rebase-abort.sh | |
| parent | f20c1fb296be2a18426541573146159fdbcc668c (diff) | |
| download | git-e505f452d4e7d0d4b603b1332ad742e74a5d5374.zip git-e505f452d4e7d0d4b603b1332ad742e74a5d5374.tar.gz git-e505f452d4e7d0d4b603b1332ad742e74a5d5374.tar.bz2 | |
t3407: use test_commit
Simplify the setup by using test_commit. Note that this replaces the
branch "pre-rebase" with a tag of the same name. "pre-rebase" is only
used as a fixed reference point so it makes sense to use a tag rather
than a branch.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3407-rebase-abort.sh')
| -rwxr-xr-x | t/t3407-rebase-abort.sh | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh index c747bd3..0ad2196 100755 --- a/t/t3407-rebase-abort.sh +++ b/t/t3407-rebase-abort.sh @@ -8,22 +8,15 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh test_expect_success setup ' - echo a > a && - git add a && - git commit -m a && + test_commit a a a && git branch to-rebase && - echo b > a && - git commit -a -m b && - echo c > a && - git commit -a -m c && + test_commit b a b && + test_commit c a c && git checkout to-rebase && - echo d > a && - git commit -a -m "merge should fail on this" && - echo e > a && - git commit -a -m "merge should fail on this, too" && - git branch pre-rebase + test_commit "merge should fail on this" a d d && + test_commit "merge should fail on this, too" a e pre-rebase ' testrebase() { |