From 86bf1243d971e9f87ecbc3636d34e59d87a932bc Mon Sep 17 00:00:00 2001
From: rsteube <rsteube@users.noreply.github.com>
Date: Fri, 16 Aug 2024 17:02:44 +0200
Subject: [PATCH] git: merge-index

---
 completers/git_completer/cmd/mergeIndex.go    | 29 +++++++++++++++++++
 .../cmd/merge_index_generated.go              | 19 ------------
 2 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 completers/git_completer/cmd/mergeIndex.go
 delete mode 100644 completers/git_completer/cmd/merge_index_generated.go

diff --git a/completers/git_completer/cmd/mergeIndex.go b/completers/git_completer/cmd/mergeIndex.go
new file mode 100644
index 0000000000..4b53a2cf98
--- /dev/null
+++ b/completers/git_completer/cmd/mergeIndex.go
@@ -0,0 +1,29 @@
+package cmd
+
+import (
+	"github.com/carapace-sh/carapace"
+	"github.com/spf13/cobra"
+)
+
+var mergeIndexCmd = &cobra.Command{
+	Use:     "merge-index",
+	Short:   "Run a merge for files needing merging",
+	Run:     func(cmd *cobra.Command, args []string) {},
+	GroupID: groups[group_low_level_manipulator].ID,
+}
+
+func init() {
+	carapace.Gen(mergeIndexCmd).Standalone()
+
+	mergeIndexCmd.Flags().BoolS("a", "a", false, "run merge against all files in the index that need merging")
+	mergeIndexCmd.Flags().BoolS("o", "o", false, "instead of stopping at the first failed merge, do all of them in one shot")
+	mergeIndexCmd.Flags().BoolS("q", "q", false, "do not complain about a failed merge program")
+	rootCmd.AddCommand(mergeIndexCmd)
+
+	carapace.Gen(mergeIndexCmd).PositionalCompletion(
+		carapace.Batch(
+			carapace.ActionExecutables(),
+			carapace.ActionFiles(),
+		).ToA(),
+	)
+}
diff --git a/completers/git_completer/cmd/merge_index_generated.go b/completers/git_completer/cmd/merge_index_generated.go
deleted file mode 100644
index 0ba206e6fc..0000000000
--- a/completers/git_completer/cmd/merge_index_generated.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package cmd
-
-import (
-	"github.com/carapace-sh/carapace"
-	"github.com/spf13/cobra"
-)
-
-var merge_indexCmd = &cobra.Command{
-	Use:     "merge-index",
-	Short:   "Run a merge for files needing merging",
-	Run:     func(cmd *cobra.Command, args []string) {},
-	GroupID: groups[group_low_level_manipulator].ID,
-}
-
-func init() {
-	carapace.Gen(merge_indexCmd).Standalone()
-
-	rootCmd.AddCommand(merge_indexCmd)
-}