允许有未跟踪文件情况下,切换分支

(cherry picked from commit 3221130833)
This commit is contained in:
mrbeanc
2024-01-02 00:28:15 +08:00
parent 74c23de106
commit 5938997a49

View File

@@ -31,7 +31,8 @@ fn switch_to_commit(commit_hash: Hash) {
fn switch_to(branch: String, detach: bool) -> Result<(), SwitchErr> {
// 检查更改
if !status::changes_to_be_staged().is_empty() {
let unstaged = status::changes_to_be_staged(); // unstaged.new是未跟踪 不需要处理
if !unstaged.deleted.is_empty() || !unstaged.modified.is_empty() {
status::status();
println!("fatal: 你有未暂存的更改,切换分支会导致更改丢失");
return Err(SwitchErr::NoClean);