backport #11204: fix: regression in 11200 (#11216)

Remove all error checking for empty projects in [$ dune subst] Signed-off-by: Rudi Grinberg <me@rgrinberg.com> Signed-off-by: Etienne Marais <dev@maiste.fr> Co-authored-by: Rudi Grinberg <me@rgrinberg.com>
ocaml · Dec 17, 2024 · 324e1b5 · 324e1b5
1 parent 8835ad5
commit 324e1b5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/bin/subst.ml b/bin/subst.ml
@@ -332,6 +332,10 @@ let subst vcs =
                  |> Memo.return)
        in
        Some (None, None, Path.Source.Set.to_list files))
+  >>| Option.bind ~f:(fun ((_, _, files) as s) ->
+    match files with
+    | [] -> None
+    | _ :: _ -> Some s)
   >>= Memo.Option.iter ~f:(fun (version, commit, files) ->
     let+ (dune_project : Dune_project.t) =
       (* CR-soon rgrinberg: unify this check with the above version check *)

diff --git a/doc/changes/11204.md b/doc/changes/11204.md
@@ -0,0 +1,2 @@
+- Remove useless error message when running `$ dune subst` in empty projects.
+  (@rgrinberg, #11204, fixes #11200)
diff --git a/test/blackbox-tests/test-cases/github11200.t b/test/blackbox-tests/test-cases/github11200.t
@@ -0,0 +1,4 @@
+Running `dune subst` should succeed in an empty directory.
+Regression test for https://github.com/ocaml/dune/issues/11200
+
+  $ dune subst
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Remove useless error message when running `$ dune subst` in empty projects.
		(@rgrinberg, #11204, fixes #11200)