Llewellyn/starship
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/starship.git synced 2024-11-05 04:47:58 +00:00
Code Issues Releases Activity

fix(git_state): panic on interactive rebase (#1552)

Browse Source
This commit is contained in:
Martin Åkesson 2020-08-14 19:09:01 +02:00 committed by GitHub
parent 0912ed0058
commit c0b6e97f57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/git_state.rs
View File

@ -133,8 +133,10 @@ fn describe_rebase<'a>(root: &'a PathBuf, rebase_config: &'a str) -> StateDescri
Some((current, total)) Some((current, total))
}; };
let progress = if has_path("rebase-merge") { let progress = if has_path("rebase-merge/msgnum") {
paths_to_progress("rebase-merge/msgnum", "rebase-merge/end") paths_to_progress("rebase-merge/msgnum", "rebase-merge/end")
} else if has_path("rebase-merge/onto") {
Some((1, 1))
} else if has_path("rebase-apply") { } else if has_path("rebase-apply") {
paths_to_progress("rebase-apply/next", "rebase-apply/last") paths_to_progress("rebase-apply/next", "rebase-apply/last")
} else { } else {