Skip to content

Commit

Permalink
Avoid running a pager when running 'git diff'
Browse files Browse the repository at this point in the history
my parallel tests hang because of this

Signed-off-by: Louis Gesbert <[email protected]>
  • Loading branch information
AltGr committed Nov 3, 2020
1 parent db18a12 commit bfae536
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/dune_engine/print_diff.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit bfae536

Please sign in to comment.