Allows gpg to run for merge commands

jesseduffield · Aug 17, 2024 · 9bfd585 · 9bfd585
1 parent 9404c23
commit 9bfd585
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/pkg/commands/git_commands/rebase.go b/pkg/commands/git_commands/rebase.go
@@ -470,7 +470,7 @@ func (self *RebaseCommands) GenericMergeOrRebaseAction(commandType string, comma
 	return nil
 }
 
-func (self *RebaseCommands) runSkipEditorCommand(cmdObj oscommands.ICmdObj) error {
+func (self *RebaseCommands) AddSkipEditorCommand(cmdObj oscommands.ICmdObj) oscommands.ICmdObj {
 	instruction := daemon.NewExitImmediatelyInstruction()
 	lazyGitPath := oscommands.GetLazygitPath()
 	return cmdObj.
@@ -480,8 +480,11 @@ func (self *RebaseCommands) runSkipEditorCommand(cmdObj oscommands.ICmdObj) erro
 			"EDITOR="+lazyGitPath,
 			"VISUAL="+lazyGitPath,
 		).
-		AddEnvVars(daemon.ToEnvVars(instruction)...).
-		Run()
+		AddEnvVars(daemon.ToEnvVars(instruction)...)
+}
+
+func (self *RebaseCommands) runSkipEditorCommand(cmdObj oscommands.ICmdObj) error {
+	return self.AddSkipEditorCommand(cmdObj).Run()
 }
 
 // DiscardOldFileChanges discards changes to a file from an old commit

diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
@@ -123,7 +123,17 @@ func (self *MergeAndRebaseHelper) genericMergeCommand(command string) error {
 			self.c.Git().Rebase.GenericMergeOrRebaseActionCmdObj(commandType, command),
 		)
 	}
-	result := self.c.Git().Rebase.GenericMergeOrRebaseAction(commandType, command)
+
+	runCmd := self.c.Git().Rebase.AddSkipEditorCommand(
+		self.c.Git().Rebase.GenericMergeOrRebaseActionCmdObj(commandType, command))
+
+	var result error = nil
+	if self.c.Git().Config.UsingGpg() && command != REBASE_OPTION_ABORT {
+		result = self.c.RunSubprocessAndRefresh(runCmd)
+	} else {
+		result = runCmd.Run()
+	}
+
 	if err := self.CheckMergeOrRebase(result); err != nil {
 		return err
 	}