diff options
| author |  John Cai <johncai86@gmail.com> | 2022-03-18 13:54:02 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2022-03-18 09:48:52 -0700 |
| commit | 77ab58c0919ea9d13251c3a1ba52b301d91e1912 (patch) | |
| tree | 957d2cb27c3bfd16d35e99c717f3738264e8177f | |
| parent | The tenth batch (diff) | |
| download | tgif-77ab58c0919ea9d13251c3a1ba52b301d91e1912.tar.xz | |
rebase: use test_commit helper in setup
To prepare for the next commit that will test rebase with oids instead
of branch names, update the rebase setup test to add a couple of tags we
can use. This uses the test_commit helper so we can replace some lines
that add a commit manually.
Setting logAllRefUpdates is not necessary because it's on by default for
repositories with a working tree.
Helped-by: Phillip Wood <phillip.wood123@gmail.com>
Signed-off-by: John Cai <johncai86@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t3400-rebase.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 71b1735e1d..0643d01525 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -18,10 +18,7 @@ GIT_AUTHOR_EMAIL=bogus@email@address export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL test_expect_success 'prepare repository with topic branches' ' - git config core.logAllRefUpdates true && - echo First >A && - git update-index --add A && - git commit -m "Add A." && + test_commit "Add A." A First First && git checkout -b force-3way && echo Dummy >Y && git update-index --add Y && @@ -32,9 +29,7 @@ test_expect_success 'prepare repository with topic branches' ' git mv A D/A && git commit -m "Move A." && git checkout -b my-topic-branch main && - echo Second >B && - git update-index --add B && - git commit -m "Add B." && + test_commit "Add B." B Second Second && git checkout -f main && echo Third >>A && git update-index A && |