Merge pull request #107 from xhtmlboi/yocaml-git-remove-polymorphic-equal

Remove Polymorphic comparison in Yocaml_git

Author: xvw

CHANGES.md

@@ -1,5 +1,9 @@
 ### Unreleased
 
+#### Yocaml_git
+
+- A more robust metric for `is_file` and `is_directory` in Git context (by [dinosaure](https://github.com/dinosaure))
+
 #### Yocaml_liquid
 
 - ⁠First release - Add support for Shopify Liquid templating language (by [Dev-JoyA](https://github.com/Dev-JoyA))

plugins/yocaml_git/runtime.ml

@@ -104,19 +104,21 @@ struct
       match on with
       | `Source -> Source.lift @@ Source.is_directory ~on path
       | `Target ->
-          let open Lwt.Syntax in
-          let+ k = Store.exists store (to_kv_path path) in
-          Ok (k = Ok (Some `Dictionary))
-          |> Result.fold ~ok:Fun.id ~error:(Fun.const false)
+          let open Lwt.Infix in
+          Store.exists store (to_kv_path path)
+          >|= Result.fold
+                ~ok:(function Some `Dictionary -> true | _ -> false)
+                ~error:(Fun.const false)
 
     let is_file ~on path =
       match on with
       | `Source -> Source.lift @@ Source.is_file ~on path
       | `Target ->
-          let open Lwt.Syntax in
-          let+ k = Store.exists store (to_kv_path path) in
-          Ok (k = Ok (Some `Value))
-          |> Result.fold ~ok:Fun.id ~error:(Fun.const false)
+          let open Lwt.Infix in
+          Store.exists store (to_kv_path path)
+          >|= Result.fold
+                ~ok:(function Some `Value -> true | _ -> false)
+                ~error:(Fun.const false)
 
     let exec ?is_success prog args =
       lift_result @@ Source.exec ?is_success prog args