diff options
| author | Oliver Reiche <oliver.reiche@gmail.com> | 2023-03-24 17:42:10 +0100 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2023-03-27 10:29:17 +0200 |
| commit | 8bfd79b7933231fbec28bc90dd8f2918729d3a0f (patch) | |
| tree | 628eb9058ddedf0c51c34ea6c545406e4dfda5c8 /test | |
| parent | 95481ac52b77c52443a47a2f10d8152ad7593cfb (diff) | |
| download | justbuild-8bfd79b7933231fbec28bc90dd8f2918729d3a0f.tar.gz | |
MR Tests: Separate git init and branch creation
... as `git init -b ...` is a rather recent git feature.
Diffstat (limited to 'test')
| -rw-r--r-- | test/buildtool/build_engine/base_maps/create_maps_test_git_bundle.sh | 3 | ||||
| -rw-r--r-- | test/buildtool/file_system/create_fs_test_git_bundle.sh | 3 | ||||
| -rw-r--r-- | test/end-to-end/just-mr/just-mr.test.sh | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/test/buildtool/build_engine/base_maps/create_maps_test_git_bundle.sh b/test/buildtool/build_engine/base_maps/create_maps_test_git_bundle.sh index 19678938..dda43340 100644 --- a/test/buildtool/build_engine/base_maps/create_maps_test_git_bundle.sh +++ b/test/buildtool/build_engine/base_maps/create_maps_test_git_bundle.sh @@ -52,7 +52,8 @@ mkdir -p test_repo cd test_repo # create the repo -git init -b master > /dev/null +git init > /dev/null +git checkout -q -b master git config user.name "Nobody" git config user.email "nobody@example.org" diff --git a/test/buildtool/file_system/create_fs_test_git_bundle.sh b/test/buildtool/file_system/create_fs_test_git_bundle.sh index d11d4b17..96cc3608 100644 --- a/test/buildtool/file_system/create_fs_test_git_bundle.sh +++ b/test/buildtool/file_system/create_fs_test_git_bundle.sh @@ -51,7 +51,8 @@ cp foo baz/baz/foo cp bar baz/baz/bar # create the repo -git init -b master > /dev/null +git init > /dev/null +git checkout -q -b master git config user.name "Nobody" git config user.email "nobody@example.org" diff --git a/test/end-to-end/just-mr/just-mr.test.sh b/test/end-to-end/just-mr/just-mr.test.sh index fa18477c..3532f8a7 100644 --- a/test/end-to-end/just-mr/just-mr.test.sh +++ b/test/end-to-end/just-mr/just-mr.test.sh @@ -72,7 +72,8 @@ EOF ( cd "${GIT_ROOT}" \ && sh "${SERVER_ROOT}/bin/git_dir_setup.sh" \ - && git init -b test \ + && git init \ + && git checkout -q -b test \ && git config user.email "nobody@example.org" \ && git config user.name "Nobody" \ && git add . \ |