hannes/git-repo-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rebase: Just continue on empty patch

Browse Source
This commit is contained in:
Hannes Körber
2022-01-05 15:57:19 +01:00
parent 31b90af066
commit eaf8e2bfa2
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/repo.rs
View File

@@ -227,6 +227,9 @@ impl Worktree {
.map_err(convert_libgit2_error)?; .map_err(convert_libgit2_error)?;
if let Err(error) = rebase.commit(None, &committer, None) { if let Err(error) = rebase.commit(None, &committer, None) {
if error.code() == git2::ErrorCode::Applied {
continue
}
rebase.abort().map_err(convert_libgit2_error)?; rebase.abort().map_err(convert_libgit2_error)?;
return Err(convert_libgit2_error(error)); return Err(convert_libgit2_error(error));
} }
@@ -323,6 +326,9 @@ impl Worktree {
.map_err(convert_libgit2_error)?; .map_err(convert_libgit2_error)?;
if let Err(error) = rebase.commit(None, &committer, None) { if let Err(error) = rebase.commit(None, &committer, None) {
if error.code() == git2::ErrorCode::Applied {
continue
}
rebase.abort().map_err(convert_libgit2_error)?; rebase.abort().map_err(convert_libgit2_error)?;
return Err(convert_libgit2_error(error)); return Err(convert_libgit2_error(error));
} }