From bfae5365763eedb5ba8a7278d27008c15328f989 Mon Sep 17 00:00:00 2001 From: Louis Gesbert Date: Tue, 3 Nov 2020 17:57:17 +0100 Subject: [PATCH] Avoid running a pager when running 'git diff' my parallel tests hang because of this Signed-off-by: Louis Gesbert --- src/dune_engine/print_diff.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dune_engine/print_diff.ml b/src/dune_engine/print_diff.ml index e41f4b88353..1638c35e16e 100644 --- a/src/dune_engine/print_diff.ml +++ b/src/dune_engine/print_diff.ml @@ -40,7 +40,7 @@ let print ?(skip_trailing_cr = Sys.win32) path1 path2 = match which "git" with | Some path -> ( path - , [ "diff"; "--no-index"; "--color=always"; "-u" ] + , [ "--no-pager"; "diff"; "--no-index"; "--color=always"; "-u" ] , "--ignore-cr-at-eol" , List.map ~f:(fun (path, file) -> resolve_link ~dir path file)