git subrepo clone https://github.com/rgrinberg/merlin ocaml-lsp-server/vendor/merlin

subrepo:
  subdir:   "ocaml-lsp-server/vendor/merlin"
  merged:   "a66e05c3"
upstream:
  origin:   "https://github.com/rgrinberg/merlin"
  branch:   "master"
  commit:   "a66e05c3"
git-subrepo:
  version:  "0.4.1"
  origin:   "???"
  commit:   "???"

_

ps-id: 311ebd48-4e01-46c3-8039-91f79045265b

Author: rgrinberg

CHANGES.md

@@ -1,3 +1,9 @@
+# 1.13.1
+
+## Fixes
+
+- Fix cwd when executing ppx (#805)
+
 # 1.13.0
 
 ## Features

ocaml-lsp-server/vendor/merlin/.gitrepo

@@ -5,8 +5,8 @@
 ;
 [subrepo]
 	remote = https://github.com/rgrinberg/merlin
-	branch = lsp
-	commit = d9022fde15484e03b5616ad038f56f31af8084d4
-	parent = fb8b19c09f05dcc91b624fd0c9b0d13790dfa5b4
+	branch = master
+	commit = a66e05c3bb7e28e04394572739e881a748482925
+	parent = c8be46208ea40578ce6b9029c172615a522de6b3
 	method = rebase
 	cmdver = 0.4.1

ocaml-lsp-server/vendor/merlin/src/kernel/mtyper.ml

@@ -208,5 +208,3 @@ let node_at ?(skip_recovered=false) t pos_cursor =
     log ~title:"node_at" "Deepest before %s"
       (Mbrowse.print () path);
     path
-
-let initial_env res = res.initial_env

ocaml-lsp-server/vendor/merlin/src/kernel/mtyper.mli

@@ -40,5 +40,3 @@ val initial_env : result -> Env.t
  *)
 val node_at :
   ?skip_recovered:bool -> result -> Lexing.position -> Mbrowse.t
-
-val initial_env : result -> Env.t

ocaml-lsp-server/vendor/merlin/src/ocaml/driver/pparse.ml

@@ -49,7 +49,11 @@ let merlin_system_command =
       let prog = "/bin/bash" in
       let argv = ["sh"; "-c"; cmd] in
       let stdin = Unix.openfile "/dev/null" [ Unix.O_RDONLY ] 0x777  in
-      let pid = Spawn.spawn ~prog ~argv ~stdin ~stdout:Unix.stderr ~stderr:Unix.stderr () in
+      let pid =
+        let cwd : Spawn.Working_dir.t = Path cwd in
+        let stdout = Unix.stderr in
+        Spawn.spawn ~cwd ~prog ~argv ~stdin ~stdout ()
+      in
       let (_, status) = Unix.waitpid [] pid in
       let res =
         match (status : Unix.process_status) with