vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

v.util: prevent diff tool lookups when VDIFF_TOOL is set

pull/9614/head
Delyan Angelov 2021-04-06 13:22:04 +03:00
parent 9bb3a5b3a3
commit c1f2c570bc
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vlib/v/util/diff.v
View File

@ -8,6 +8,9 @@ import time
pub fn find_working_diff_command() ?string { pub fn find_working_diff_command() ?string {
env_difftool := os.getenv('VDIFF_TOOL') env_difftool := os.getenv('VDIFF_TOOL')
env_diffopts := os.getenv('VDIFF_OPTIONS') env_diffopts := os.getenv('VDIFF_OPTIONS')
if env_difftool != '' {
return '$env_difftool $env_diffopts'
}
mut known_diff_tools := []string{} mut known_diff_tools := []string{}
if env_difftool.len > 0 { if env_difftool.len > 0 {
known_diff_tools << env_difftool known_diff_tools << env_difftool