Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 6ce02ae

Browse files
committedJan 31, 2022
support DUNE_DIFF_COMMAND environment variable
Signed-off-by: Raphaël Proust <code@bnwr.net>
1 parent ef1ee9a commit 6ce02ae

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed
 

‎CHANGES.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
Unreleased
22
----------
33

4+
- Add a `DUNE_DIFF_COMMAND` environment variable to match `--diff-command`
5+
command-line parameter (@raphael-proust, fix #5369, #5375)
6+
47
- Add support for odoc-link rules (#5045, @lubegasimon)
58

69
- Dune will no longer generate documentation for hidden modules (#5045,

‎bin/common.ml

+5-3
Original file line numberDiff line numberDiff line change
@@ -889,13 +889,15 @@ let term ~default_root_is_cwd =
889889
~env:(Arg.env_var ~doc "DUNE_BUILD_DIR")
890890
~doc)
891891
and+ diff_command =
892+
let doc = "Shell command to use to diff files.\n\
893+
\ Use - to disable printing the diff."
894+
in
892895
Arg.(
893896
value
894897
& opt (some string) None
895898
& info [ "diff-command" ] ~docs
896-
~doc:
897-
"Shell command to use to diff files.\n\
898-
\ Use - to disable printing the diff.")
899+
~env:(Arg.env_var ~doc "DUNE_DIFF_COMMAND")
900+
~doc)
899901
and+ stats_trace_file =
900902
Arg.(
901903
value

0 commit comments

Comments
 (0)