Backed out changeset a8d1b2a81511 (bug 1853184) for causing python vc…

…s failures CLOSED TREE

python/mozversioncontrol/test/conftest.py

@@ -28,7 +28,7 @@
         """
         echo "foo" > foo
         echo "bar" > bar
-        git init --initial-branch main
+        git init
         git config user.name "Testing McTesterson"
         git config user.email "<[email protected]>"
         git add *
@@ -37,7 +37,7 @@
         """
         git remote add upstream ../remoterepo
         git fetch upstream
-        git branch -u upstream/main
+        git branch -u upstream/master
         """,
     ],
 }

python/mozversioncontrol/test/test_branch.py

@@ -36,7 +36,7 @@ def test_branch(repo):
         pytest.xfail("`git branch --show-current` not implemented yet")
 
     if vcs.name == "git":
-        assert vcs.branch == "main"
+        assert vcs.branch == "master"
     else:
         assert vcs.branch is None
 

python/mozversioncontrol/test/test_workdir_outgoing.py

@@ -58,7 +58,7 @@ def test_workdir_outgoing(repo):
     vcs = get_repository_object(repo.dir)
     assert vcs.path == str(repo.dir)
 
-    remote_path = "../remoterepo" if repo.vcs == "hg" else "upstream/main"
+    remote_path = "../remoterepo" if repo.vcs == "hg" else "upstream/master"
 
     # Mutate files.
     repo.execute_next_step()