Skip to content

Commit

Permalink
Merge pull request #2167 from metanivek/351_fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
metanivek committed Jan 11, 2023
2 parents 41a85ff + 63ad5c7 commit ff45092
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
- Improve GC reachability traversal to optimize memory, speed and remove
the need for temporary files. (#2085, @art-w)

## 3.5.1

### Fixed

- **irmin-pack**
Expand Down
2 changes: 1 addition & 1 deletion irmin-cli.opam
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ doc: "https://mirage.github.io/irmin/"
build: [
["dune" "subst"] {dev}
["dune" "build" "-p" name "-j" jobs]
["dune" "runtest" "-p" name "-j" jobs] {with-test}
["dune" "runtest" "-p" name "-j" jobs] {with-test & os != "macos"}
]

available: arch != "arm32" & arch != "x86_32"
Expand Down
2 changes: 1 addition & 1 deletion irmin-graphql.opam
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ doc: "https://mirage.github.io/irmin/"
build: [
["dune" "subst"] {dev}
["dune" "build" "-p" name "-j" jobs]
["dune" "runtest" "-p" name "-j" jobs] {with-test}
["dune" "runtest" "-p" name "-j" jobs] {with-test & os != "macos"}
]

depends: [
Expand Down
2 changes: 1 addition & 1 deletion irmin-http.opam
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ doc: "https://mirage.github.io/irmin/"
build: [
["dune" "subst"] {dev}
["dune" "build" "-p" name "-j" jobs]
["dune" "runtest" "-p" name "-j" jobs] {with-test}
["dune" "runtest" "-p" name "-j" jobs] {with-test & os != "macos"}
]

depends: [
Expand Down
3 changes: 2 additions & 1 deletion src/irmin-pack/unix/checks.ml
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,10 @@ module Make (Store : Store) = struct
| Error (`Msg m) -> Fmt.kstr Lwt.fail_with "Invalid hash %S" m)
heads
in
let+ result =
let* result =
Store.integrity_check ~ppf:Format.err_formatter ~auto_repair ~heads repo
in
let+ () = Store.Repo.close repo in
handle_result ?name:None result

let heads =
Expand Down

0 comments on commit ff45092

Please sign in to comment.