tests/{git-server,back}: Use a branch move instead of create and delete

`git` is now too smart, to let us delete the main branch and create a
new master branch.

2 files changed, 12 insertions, 6 deletions

diff --git a/tests/by-name/ba/back/test.nix b/tests/by-name/ba/back/test.nix
index cce5ede..41d6c8e 100644
--- a/tests/by-name/ba/back/test.nix
+++ b/tests/by-name/ba/back/test.nix
@@ -109,6 +109,12 @@ in
 
 
       with subtest("admin can clone and configure gitolite-admin.git"):
+        server.succeed("sudo -u git ${pkgs.writeShellScript "delete_main_branch_on_server" ''
+        set -xe
+
+        cd ~git/repositories/gitolite-admin.git
+        git branch --move --force main master
+      ''}")
         client.succeed("${pkgs.writeShellScript "setup-gitolite-admin.git" ''
         set -xe
 
@@ -118,12 +124,9 @@ in
 
         cp ${sshKeys.alice.pub} gitolite-admin/keydir/alice.pub
 
-        (cd gitolite-admin && git switch -c master && git branch -D main)
-
         (cd gitolite-admin && git add . && git commit -m 'Add keys for alice' && git push -u origin master)
         cat ${gitoliteAdminConfSnippet} >> gitolite-admin/conf/gitolite.conf
         (cd gitolite-admin && git add . && git commit -m 'Add support for wild repos' && git push)
-        (cd gitolite-admin && git push -d origin main)
       ''}")
 
       with subtest("alice can create a repo"):
diff --git a/tests/by-name/gi/git-server/test.nix b/tests/by-name/gi/git-server/test.nix
index 5cd8c33..524efcb 100644
--- a/tests/by-name/gi/git-server/test.nix
+++ b/tests/by-name/gi/git-server/test.nix
@@ -122,6 +122,12 @@ in
 
 
       with subtest("admin can clone and configure gitolite-admin.git"):
+        server.succeed("sudo -u git ${pkgs.writeShellScript "delete_main_branch_on_server" ''
+        set -xe
+
+        cd ~git/repositories/gitolite-admin.git
+        git branch --move --force main master
+      ''}")
         client.succeed("${pkgs.writeShellScript "setup-gitolite-admin.git" ''
         set -xe
 
@@ -132,12 +138,9 @@ in
         cp ${sshKeys.alice.pub} gitolite-admin/keydir/alice.pub
         cp ${sshKeys.bob.pub} gitolite-admin/keydir/bob.pub
 
-        (cd gitolite-admin && git switch -c master && git branch -D main)
-
         (cd gitolite-admin && git add . && git commit -m 'Add keys for alice, bob' && git push -u origin master)
         cat ${gitoliteAdminConfSnippet} >> gitolite-admin/conf/gitolite.conf
         (cd gitolite-admin && git add . && git commit -m 'Add support for wild repos' && git push)
-        (cd gitolite-admin && git push -d origin main)
       ''}")
 
         server.succeed("${pkgs.writeShellScript "verify gitolite-admin.conf" ''