We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 42ca073 commit 30d7752Copy full SHA for 30d7752
asyncgit/src/sync/rebase.rs
@@ -108,13 +108,18 @@ pub fn rebase(
108
pub fn continue_rebase(
109
repo: &git2::Repository,
110
) -> Result<RebaseState> {
111
+ let mut rebase = repo.open_rebase(None)?;
112
+ let signature =
113
+ crate::sync::commit::signature_allow_undefined_name(repo)?;
114
+
115
if repo.index()?.has_conflicts() {
116
return Ok(RebaseState::Conflicted);
117
}
118
- let mut rebase = repo.open_rebase(None)?;
- let signature =
- crate::sync::commit::signature_allow_undefined_name(repo)?;
119
+ // try commit current rebase step
120
+ if !repo.index()?.is_empty() {
121
+ rebase.commit(None, &signature, None)?;
122
+ }
123
124
while let Some(op) = rebase.next() {
125
let _op = op?;
0 commit comments