Skip to content

Commit fe954b9

Browse files
committed
fix debug assert, thanks gitpython
1 parent e326352 commit fe954b9

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

git-object/src/mutable/tree.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@ impl Tree {
6262
debug_assert_eq!(
6363
&{
6464
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+
});
6669
entries_sorted
6770
},
6871
&self.entries,

tests/tools/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ pub fn scripted_fixture_repo_read_only(script_name: &str) -> std::result::Result
2929
if !script_result_directory.is_dir() {
3030
std::fs::create_dir_all(&script_result_directory)?;
3131
let script_absolute_path = std::env::current_dir()?.join(script_path);
32-
// export =
33-
// export GIT_COMMITTER_NAME=committer
3432
let output = std::process::Command::new("bash")
3533
.arg(script_absolute_path)
3634
.stdout(std::process::Stdio::piped())

0 commit comments

Comments
 (0)