File tree Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -62,7 +62,10 @@ impl Tree {
62
62
debug_assert_eq ! (
63
63
& {
64
64
let mut entries_sorted = self . entries. clone( ) ;
65
- entries_sorted. sort_by( |lhs, rhs| lhs. filename. cmp( & rhs. filename) ) ;
65
+ entries_sorted. sort_by( |lhs, rhs| {
66
+ let len = lhs. filename. len( ) . min( rhs. filename. len( ) ) ;
67
+ lhs. filename[ ..len] . cmp( & rhs. filename[ ..len] )
68
+ } ) ;
66
69
entries_sorted
67
70
} ,
68
71
& self . entries,
Original file line number Diff line number Diff line change @@ -29,8 +29,6 @@ pub fn scripted_fixture_repo_read_only(script_name: &str) -> std::result::Result
29
29
if !script_result_directory. is_dir ( ) {
30
30
std:: fs:: create_dir_all ( & script_result_directory) ?;
31
31
let script_absolute_path = std:: env:: current_dir ( ) ?. join ( script_path) ;
32
- // export =
33
- // export GIT_COMMITTER_NAME=committer
34
32
let output = std:: process:: Command :: new ( "bash" )
35
33
. arg ( script_absolute_path)
36
34
. stdout ( std:: process:: Stdio :: piped ( ) )
You can’t perform that action at this time.
0 commit comments