File tree 2 files changed +4
-4
lines changed
2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ pub fn installation_config_prefix() -> Option<&'static Path> {
30
30
31
31
/// Return the shell that Git would use, the shell to execute commands from.
32
32
///
33
- /// On Windows, this is the full path to `sh.exe` bundled with it , and on
33
+ /// On Windows, this is the full path to `sh.exe` bundled with Git , and on
34
34
/// Unix it's `/bin/sh` as posix compatible shell.
35
35
/// If the bundled shell on Windows cannot be found, `sh` is returned as the name of a shell
36
36
/// as it could possibly be found in `PATH`.
@@ -39,7 +39,7 @@ pub fn shell() -> &'static OsStr {
39
39
static PATH : Lazy < OsString > = Lazy :: new ( || {
40
40
if cfg ! ( windows) {
41
41
core_dir ( )
42
- . and_then ( |p| p. ancestors ( ) . nth ( 3 ) /* skip mingw64/libexec/git-core */ )
42
+ . and_then ( |p| p. ancestors ( ) . nth ( 3 ) ) // Skip something like mingw64/libexec/git-core.
43
43
. map ( |p| p. join ( "usr" ) . join ( "bin" ) . join ( "sh.exe" ) )
44
44
. map_or_else ( || OsString :: from ( "sh" ) , Into :: into)
45
45
} else {
@@ -122,7 +122,7 @@ static GIT_CORE_DIR: Lazy<Option<PathBuf>> = Lazy::new(|| {
122
122
}
123
123
124
124
BString :: new ( output. stdout )
125
- . trim_with ( |b| b . is_ascii_whitespace ( ) )
125
+ . strip_suffix ( b" \n " ) ?
126
126
. to_path ( )
127
127
. ok ( ) ?
128
128
. to_owned ( )
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ fn installation_config() {
27
27
#[ test]
28
28
fn core_dir ( ) {
29
29
assert ! (
30
- gix_path:: env:: core_dir( ) . expect( "Git is always in PATH" ) . is_dir( ) ,
30
+ gix_path:: env:: core_dir( ) . expect( "Git is always in PATH when we run tests " ) . is_dir( ) ,
31
31
"The core directory is a valid directory"
32
32
) ;
33
33
}
You can’t perform that action at this time.
0 commit comments