From eaf8e2bfa2266c2046679e564c01e3ff324a18f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Wed, 5 Jan 2022 15:57:19 +0100
Subject: [PATCH] rebase: Just continue on empty patch

---
 src/repo.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/repo.rs b/src/repo.rs
index d277f1a..5d4dd91 100644
--- a/src/repo.rs
+++ b/src/repo.rs
@@ -227,6 +227,9 @@ impl Worktree {
                         .map_err(convert_libgit2_error)?;
 
                     if let Err(error) = rebase.commit(None, &committer, None) {
+                        if error.code() == git2::ErrorCode::Applied {
+                            continue
+                        }
                         rebase.abort().map_err(convert_libgit2_error)?;
                         return Err(convert_libgit2_error(error));
                     }
@@ -323,6 +326,9 @@ impl Worktree {
                 .map_err(convert_libgit2_error)?;
 
             if let Err(error) = rebase.commit(None, &committer, None) {
+                if error.code() == git2::ErrorCode::Applied {
+                    continue
+                }
                 rebase.abort().map_err(convert_libgit2_error)?;
                 return Err(convert_libgit2_error(error));
             }