From 954fb9f1bc8826425629907a0b2234382333f589 Mon Sep 17 00:00:00 2001
From: mrbeanc <mrbeanc@qq.com>
Date: Tue, 2 Jan 2024 11:28:42 +0800
Subject: [PATCH] fix: switch-test (cherry picked from commit
 82ae9c90c590bbc19e8d50f0915ff6e202fc99ae)

---
 src/commands/switch.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/commands/switch.rs b/src/commands/switch.rs
index d56406e..7471a14 100644
--- a/src/commands/switch.rs
+++ b/src/commands/switch.rs
@@ -103,11 +103,11 @@ mod test {
         /* test 1: NoClean */
         let test_file_1 = PathBuf::from("test_file_1");
         test::ensure_file(&test_file_1, None);
+        cmd::add(vec![], true, false); // add all
         let result = switch_to(test_branch_1.clone(), false);
         assert!(result.is_err());
         assert!(matches!(result.unwrap_err(), SwitchErr::NoClean));
 
-        cmd::add(vec![], true, false); // add all
         cmd::commit("add file 1".to_string(), true);
         let test_branch_2 = "test_branch_2".to_string();
         cmd::branch(Some(test_branch_2.clone()), None, false, None, false); // branch2: test_file_1 exists
@@ -140,7 +140,8 @@ mod test {
         /* test 4: switch to branch */
         let result = switch_to(test_branch_2.clone(), false);
         assert!(result.is_ok());
-        assert!(status::changes_to_be_staged().is_empty() && status::changes_to_be_committed().is_empty());
+        assert!(status::changes_to_be_staged().is_empty());
+        assert!(status::changes_to_be_committed().is_empty());
         assert!(match head::current_head() {
             head::Head::Branch(branch) => branch == test_branch_2,
             _ => false,