-
Notifications
You must be signed in to change notification settings - Fork 69
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #439 from sternenseemann/fix-tests-in-nix-sandbox
git-unix: make index and regression test work without global gitconfig
- Loading branch information
Showing
2 changed files
with
20 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -183,6 +183,11 @@ let delete_should_be_empty = | |
| let run path = | ||
| let open Rresult in | ||
| Bos.OS.Dir.with_current path @@ fun () -> | ||
| Bos.OS.Cmd.run Bos.Cmd.(v "git" % "config" % "user.name" % "test") | ||
| >>= fun () -> | ||
| Bos.OS.Cmd.run | ||
| Bos.Cmd.(v "git" % "config" % "user.email" % "[email protected]") | ||
| >>= fun () -> | ||
| Bos.OS.Cmd.run Bos.Cmd.(v "git" % "commit" % "-m" % ".") >>= fun () -> | ||
| load ~hash:SHA1 Fpath.(v ".git" / "index") >>= fun t -> | ||
| (* XXX(dinosaure): [git] deletes [should-be-empty] into the index file **AND** | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -385,6 +385,11 @@ let commit_foo store = | |
| let commit = | ||
| let open Rresult in | ||
| Bos.OS.Dir.with_current path @@ fun () -> | ||
| Bos.OS.Cmd.run Bos.Cmd.(v "git" % "config" % "user.name" % "test") | ||
| >>= fun () -> | ||
| Bos.OS.Cmd.run | ||
| Bos.Cmd.(v "git" % "config" % "user.email" % "[email protected]") | ||
| >>= fun () -> | ||
| Bos.OS.File.write (Fpath.v "foo") "" >>= fun () -> | ||
| Bos.OS.Cmd.run Bos.Cmd.(v "git" % "add" % "foo") >>= fun () -> | ||
| Bos.OS.Cmd.run Bos.Cmd.(v "git" % "commit" % "-m" % ".") >>= fun () -> | ||
|
|
@@ -1490,6 +1495,11 @@ let test_partial_fetch_ssh () = | |
| let fiber = | ||
| let open Rresult in | ||
| OS.Dir.with_current path @@ fun () -> | ||
| OS.Cmd.run Bos.Cmd.(v "git" % "config" % "user.name" % "test") | ||
| >>= fun () -> | ||
| OS.Cmd.run | ||
| Bos.Cmd.(v "git" % "config" % "user.email" % "[email protected]") | ||
| >>= fun () -> | ||
| OS.Cmd.run Cmd.(v "touch" % "foo") >>= fun () -> | ||
| OS.Cmd.run Cmd.(v "git" % "add" % "foo") >>= fun () -> | ||
| OS.Cmd.run Cmd.(v "git" % "commit" % "-m" % ".") | ||
|
|
@@ -1503,6 +1513,11 @@ let test_partial_fetch_ssh () = | |
| let fiber = | ||
| let open Rresult in | ||
| OS.Dir.with_current path @@ fun () -> | ||
| OS.Cmd.run Bos.Cmd.(v "git" % "config" % "user.name" % "test") | ||
| >>= fun () -> | ||
| OS.Cmd.run | ||
| Bos.Cmd.(v "git" % "config" % "user.email" % "[email protected]") | ||
| >>= fun () -> | ||
| OS.Cmd.run Cmd.(v "touch" % "bar") >>= fun () -> | ||
| OS.Cmd.run Cmd.(v "git" % "add" % "bar") >>= fun () -> | ||
| OS.Cmd.run Cmd.(v "git" % "commit" % "-m" % ".") >>= fun () -> | ||
|
|
||