attempt git am --abortv0.22.126

1 files changed, 4 insertions, 0 deletions

diff --git a/windowPatches.go b/windowPatches.go
index 3eb1d7b..470ca10 100644
--- a/windowPatches.go
+++ b/windowPatches.go
@@ -94,6 +94,8 @@ func makePatchesWin(patches *forgepb.Patches) *stdPatchTableWin {
 			}
 			count += 1
 			if err := applyPatch(repo, filename); err != nil {
+				cmd := []string{"git", "am", "--abort"}
+				err := repo.RunVerbose(cmd)
 				log.Info("warn user of git am error", err)
 				return
 			}
@@ -124,6 +126,8 @@ func applyPatchNew(p *forgepb.Patch) error {
 	}
 	if err := applyPatch(repo, filename); err != nil {
 		log.Info("warn user of git am error", err)
+		cmd := []string{"git", "am", "--abort"}
+		err := repo.RunVerbose(cmd)
 		return err
 	}
 	return nil