Skip to content

Commit 56d1d09

Browse files
committed
Differentiate between Executable and Program
It's somewhat confusing, but it seems sometimes `git` uses a shell, but other times it doesn't. And that is differentiate by the type system. It would still have to be (re)validated at some point if this is actually the case, but I guess there was a reason for this in the first place.
1 parent ff71e07 commit 56d1d09

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

gix/src/config/tree/sections/core.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl Core {
2323
pub const DISAMBIGUATE: Disambiguate =
2424
Disambiguate::new_with_validate("disambiguate", &config::Tree::CORE, validate::Disambiguate);
2525
/// The `core.editor` key.
26-
pub const EDITOR: keys::Executable = keys::Executable::new_executable("editor", &config::Tree::CORE);
26+
pub const EDITOR: keys::Program = keys::Program::new_program("editor", &config::Tree::CORE);
2727
/// The `core.fileMode` key.
2828
pub const FILE_MODE: keys::Boolean = keys::Boolean::new_boolean("fileMode", &config::Tree::CORE);
2929
/// The `core.ignoreCase` key.
@@ -60,10 +60,10 @@ impl Core {
6060
.with_environment_override("GIT_ASKPASS")
6161
.with_note("fallback is 'SSH_ASKPASS'");
6262
/// The `core.excludesFile` key.
63-
pub const EXCLUDES_FILE: keys::Executable = keys::Executable::new_executable("excludesFile", &config::Tree::CORE);
63+
pub const EXCLUDES_FILE: keys::Path = keys::Path::new_path("excludesFile", &config::Tree::CORE);
6464
/// The `core.attributesFile` key.
65-
pub const ATTRIBUTES_FILE: keys::Executable =
66-
keys::Executable::new_executable("attributesFile", &config::Tree::CORE)
65+
pub const ATTRIBUTES_FILE: keys::Path =
66+
keys::Path::new_path("attributesFile", &config::Tree::CORE)
6767
.with_deviation("for checkout - it's already queried but needs building of attributes group, and of course support during checkout");
6868
/// The `core.sshCommand` key.
6969
pub const SSH_COMMAND: keys::Executable = keys::Executable::new_executable("sshCommand", &config::Tree::CORE)

gix/src/config/tree/sections/diff.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ impl Diff {
1919
pub const RENAMES: Renames = Renames::new_renames("renames", &config::Tree::DIFF);
2020

2121
/// The `diff.<driver>.command` key.
22-
pub const DRIVER_COMMAND: keys::String = keys::String::new_string("command", &config::Tree::DIFF)
22+
pub const DRIVER_COMMAND: keys::Program = keys::Program::new_program("command", &config::Tree::DIFF)
2323
.with_subsection_requirement(Some(SubSectionRequirement::Parameter("driver")));
2424
/// The `diff.<driver>.textconv` key.
25-
pub const DRIVER_TEXTCONV: keys::String = keys::String::new_string("textconv", &config::Tree::DIFF)
25+
pub const DRIVER_TEXTCONV: keys::Program = keys::Program::new_program("textconv", &config::Tree::DIFF)
2626
.with_subsection_requirement(Some(SubSectionRequirement::Parameter("driver")));
2727
/// The `diff.<driver>.algorithm` key.
2828
pub const DRIVER_ALGORITHM: Algorithm =

0 commit comments

Comments
 (0)