Merge pull request #1072 from rsteube/tig-preinvoke

tig: use preinvoke
carapace-sh · Apr 29, 2022 · 58c6747 · 58c6747
2 parents af5621a + 94244d0
commit 58c6747
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/completers/tig_completer/cmd/blame.go b/completers/tig_completer/cmd/blame.go
@@ -21,7 +21,7 @@ func init() {
 	carapace.Gen(blameCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			c.Args = append([]string{"blame"}, c.Args...)
-			return git.ActionExecute().Chdir(blameCmd.Root().Flag("C").Value.String()).Invoke(c).ToA()
+			return git.ActionExecute().Invoke(c).ToA()
 		}),
 	)
 }
diff --git a/completers/tig_completer/cmd/grep.go b/completers/tig_completer/cmd/grep.go
@@ -21,7 +21,7 @@ func init() {
 	carapace.Gen(grepCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			c.Args = append([]string{"grep"}, c.Args...)
-			return git.ActionExecute().Chdir(grepCmd.Root().Flag("C").Value.String()).Invoke(c).ToA()
+			return git.ActionExecute().Invoke(c).ToA()
 		}),
 	)
 }
diff --git a/completers/tig_completer/cmd/log.go b/completers/tig_completer/cmd/log.go
@@ -21,7 +21,7 @@ func init() {
 	carapace.Gen(logCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			c.Args = append([]string{"log"}, c.Args...)
-			return git.ActionExecute().Chdir(logCmd.Root().Flag("C").Value.String()).Invoke(c).ToA()
+			return git.ActionExecute().Invoke(c).ToA()
 		}),
 	)
 }
diff --git a/completers/tig_completer/cmd/reflog.go b/completers/tig_completer/cmd/reflog.go
@@ -18,8 +18,6 @@ func init() {
 	rootCmd.AddCommand(reflogCmd)
 
 	carapace.Gen(reflogCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return git.ActionRefs(git.RefOptionDefault).Chdir(grepCmd.Root().Flag("C").Value.String())
-		}),
+		git.ActionRefs(git.RefOptionDefault),
 	)
 }
diff --git a/completers/tig_completer/cmd/root.go b/completers/tig_completer/cmd/root.go
@@ -29,9 +29,7 @@ func init() {
 	})
 
 	carapace.Gen(rootCmd).PositionalCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return git.ActionRefs(git.RefOptionDefault).Chdir(rootCmd.Flag("C").Value.String())
-		}),
+		git.ActionRefs(git.RefOptionDefault),
 	)
 
 	carapace.Gen(rootCmd).PreInvoke(func(cmd *cobra.Command, flag *pflag.Flag, action carapace.Action) carapace.Action {

diff --git a/completers/tig_completer/cmd/show.go b/completers/tig_completer/cmd/show.go
@@ -21,7 +21,7 @@ func init() {
 	carapace.Gen(showCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			c.Args = append([]string{"show"}, c.Args...)
-			return git.ActionExecute().Chdir(logCmd.Root().Flag("C").Value.String()).Invoke(c).ToA()
+			return git.ActionExecute().Invoke(c).ToA()
 		}),
 	)
 }