diff --git a/lib/src/git.rs b/lib/src/git.rs index 4ec483b8c..554562b3a 100644 --- a/lib/src/git.rs +++ b/lib/src/git.rs @@ -557,6 +557,7 @@ pub fn export_some_refs( failed_branches.push(parsed_ref_name); } } + failed_branches.sort(); Ok(failed_branches) } diff --git a/lib/tests/test_git.rs b/lib/tests/test_git.rs index 18f0f7070..7d25231f2 100644 --- a/lib/tests/test_git.rs +++ b/lib/tests/test_git.rs @@ -1351,8 +1351,8 @@ fn test_export_partial_failure() { assert_eq!( git::export_refs(mut_repo, &git_repo), Ok(vec![ - RefName::LocalBranch("HEAD".to_string()), RefName::LocalBranch("".to_string()), + RefName::LocalBranch("HEAD".to_string()), RefName::LocalBranch("main/sub".to_string()) ]) ); @@ -1376,8 +1376,8 @@ fn test_export_partial_failure() { assert_eq!( git::export_refs(mut_repo, &git_repo), Ok(vec![ + RefName::LocalBranch("".to_string()), RefName::LocalBranch("HEAD".to_string()), - RefName::LocalBranch("".to_string()) ]) ); assert!(git_repo.find_reference("refs/heads/").is_err()); @@ -1472,7 +1472,7 @@ fn test_export_reexport_transitions() { // mut_repo.view().git_refs(). assert_eq!( git::export_refs(mut_repo, &git_repo), - Ok(["AXB", "ABC", "ABX", "XAB"] + Ok(["ABC", "ABX", "AXB", "XAB"] .into_iter() .map(|s| RefName::LocalBranch(s.to_string())) .collect_vec())