Merge pull request #1569 from EliahKagan/config-origin-naming

Rename to `GIT_HIGHEST_SCOPE_CONFIG_PATH`

Sebastian Thiel committed 2 years ago

Commit 3cf96942 parents adbaa2a 06725761 file · +2 −2Browse files

Unified · Split

gix-path/src/env/git/mod.rs+2−2

@@ -80,7 +80,7 @@ pub(super) const EXE_NAME: &str = "git"; · 79 unmodified lines
80	/// Invoke the git executable to obtain the origin configuration, which is cached and returned.	80	/// Invoke the git executable to obtain the origin configuration, which is cached and returned.
81	///	81	///
82	/// The git executable is the one found in PATH or an alternative location.	82	/// The git executable is the one found in PATH or an alternative location.
83	pub(super) static GIT_HIGHEST_PRIORITY_CONFIG_PATH: Lazy<Option<BString>> = Lazy::new(exe_info);	83	pub(super) static GIT_HIGHEST_SCOPE_CONFIG_PATH: Lazy<Option<BString>> = Lazy::new(exe_info);
84		84
85	#[cfg(windows)]	85	#[cfg(windows)]
86	const NULL_DEVICE: &str = "NUL";	86	const NULL_DEVICE: &str = "NUL";
@@ -171,7 +171,7 @@ pub(super) fn install_config_path() -> Option<&'static BStr> { · 84 unmodified lines
171	exec_path.push("gitconfig");	171	exec_path.push("gitconfig");
172	return crate::os_string_into_bstring(exec_path.into()).ok();	172	return crate::os_string_into_bstring(exec_path.into()).ok();
173	}	173	}
174	GIT_HIGHEST_PRIORITY_CONFIG_PATH.clone()	174	GIT_HIGHEST_SCOPE_CONFIG_PATH.clone()
175	});	175	});
176	PATH.as_ref().map(AsRef::as_ref)	176	PATH.as_ref().map(AsRef::as_ref)
177	}	177	}