Merge pull request #4093 from rgrinberg/revert-git

Fix git tests for old git

Author: rgrinberg

otherlibs/build-info/test/run.t

@@ -11,7 +11,7 @@ Test embedding of build information
   > (package (name $i))
   > EOF
   >   (cd $i;
-  >    git init --initial-branch master -q
+  >    git init -q;
   >    git add .;
   >    git commit -q -m _;
   >    git tag -a 1.0+$i -m _)

test/blackbox-tests/test-cases/dune-project-meta/main.t/run.t

@@ -182,7 +182,7 @@ generated META and opam files.
   > EOF
 
   $ (cd version
-  >  git init --initial-branch master -q
+  >  git init -q
   >  git add .
   >  git commit -qm _
   >  git tag -a 1.0 -m 1.0
@@ -217,7 +217,7 @@ generated META and opam files.
   > EOF
 
   $ (cd version
-  >  git init --initial-branch master -q
+  >  git init -q
   >  git add .
   >  git commit -qm _
   >  git tag -a 1.0 -m 1.0

test/blackbox-tests/test-cases/meta-template-version-bug.t

@@ -1,7 +1,7 @@
 This test demonstrates a bug when there's a package with a meta template and a
 custom version:
 
-  $ git init --initial-branch master -q
+  $ git init -q
   $ git add .
   $ git commit -qm _
   $ git tag -a 1.0 -m 1.0

test/blackbox-tests/test-cases/subst.t/run.t

@@ -14,7 +14,7 @@ Project with opam files
 
   $ echo 'authors: [ "John Doe <john@doe.com>" ]' > foo.opam
 
-  $ git init --initial-branch master -q
+  $ git init --quiet
   $ git add .
   $ git commit -am _ --quiet
   $ git tag -a 1.0 -m 1.0
@@ -51,7 +51,7 @@ And without an opam file preset.
   > let version = "${X}VERSION${X}"
   > EOF
 
-  $ git init --initial-branch master -q
+  $ git init --quiet
   $ git add .
   $ git commit -am _ --quiet
   $ git tag -a 1.0 -m 1.0
@@ -88,7 +88,7 @@ Test subst and files with unicode (#3879)
   > let version = "${X}VERSION${X}"
   > EOF
 
-  $ git init --initial-branch master -q
+  $ git init --quiet
   $ git add .
   $ git commit -am _ --quiet
   $ git tag -a 1.0 -m 1.0

test/expect-tests/vcs_tests.ml

@@ -57,10 +57,7 @@ type action =
 
 let run_action (vcs : Vcs.t) action =
   match action with
-  | Init -> (
-    match vcs.kind with
-    | Hg -> run vcs [ "init" ]
-    | Git -> run vcs [ "init"; "--initial-branch"; "master" ] )
+  | Init -> run vcs [ "init"; "-q" ]
   | Add fn -> run vcs [ "add"; fn ]
   | Commit -> (
     match vcs.kind with
@@ -150,7 +147,7 @@ let%expect_test _ =
   run Git script;
   [%expect
     {|
-$ git init --initial-branch master
+$ git init -q
 $ echo "-" > a
 $ git add a
 $ git commit -m 'commit message'
@@ -193,7 +190,7 @@ let%expect_test _ =
   run Hg script;
   [%expect
     {|
-$ hg init
+$ hg init -q
 $ echo "-" > a
 $ hg add a
 $ hg commit -m 'commit message' -u toto