git: diff - added missing flags

Author: rsteube

completers/common/git_completer/cmd/common/diff.go

@@ -65,6 +65,7 @@ func AddDiffFlags(cmd *cobra.Command) {
 	cmd.Flags().Bool("no-prefix", false, "Do not show any source or destination prefix")
 	cmd.Flags().Bool("no-rename-empty", false, "Whether to use empty blobs as rename source")
 	cmd.Flags().Bool("no-renames", false, "Turn off rename detection")
+	cmd.Flags().String("no-textconv", "", "Disallow external text conversion filters to be run when comparing binary files")
 	cmd.Flags().Bool("numstat", false, "Similar to --stat, but shows number of added and deleted lines in decimal notation")
 	cmd.Flags().BoolP("ours", "2", false, "compare with our branch")
 	cmd.Flags().String("output", "", "Output to a specific file instead of stdout")
@@ -90,7 +91,7 @@ func AddDiffFlags(cmd *cobra.Command) {
 	cmd.Flags().String("submodule", "", "Specify how differences in submodules are shown")
 	cmd.Flags().Bool("summary", false, "Output a condensed summary of extended header information")
 	cmd.Flags().BoolP("text", "a", false, "Treat all files as text")
-	cmd.Flags().String("textconv", "", "Allow (or disallow) external text conversion filters to be run when comparing binary files")
+	cmd.Flags().String("textconv", "", "Allow external text conversion filters to be run when comparing binary files")
 	cmd.Flags().BoolP("theirs", "3", false, "compare with their branch")
 	cmd.Flags().BoolS("u", "u", false, "Generate patch")
 	cmd.Flags().StringP("unified", "U", "", "Generate diffs with <n> lines of context instead of the usual three")

completers/common/git_completer/cmd/diff.go

@@ -20,9 +20,22 @@ var diffCmd = &cobra.Command{
 func init() {
 	carapace.Gen(diffCmd).Standalone()
 
+	// TODO move into common flag groups
+	diffCmd.Flags().StringS("G", "G", "", "Look for differences whose patch text contains added/removed lines that match <regex>")
+	diffCmd.Flags().String("follow", "", "Continue listing the history of a file beyond renames")
+	diffCmd.Flags().StringArrayP("ignore-matching-lines", "I", nil, "Ignore changes whose all lines match <regex>")
+	diffCmd.Flags().Bool("quiet", false, "Disable all output of the program")
+	diffCmd.Flags().String("rotate-to", "", "Move the files before the named <file> to the end")
+	diffCmd.Flags().String("skip-to", "", "Discard the files before the named <file> from the output")
+	diffCmd.Flags().Bool("staged", false, "Show diff between index and named commit")
 	common.AddDiffFlags(diffCmd)
 	rootCmd.AddCommand(diffCmd)
 
+	carapace.Gen(diffCmd).FlagCompletion(carapace.ActionMap{
+		"follow":  carapace.ActionFiles(), // TODO complete files of specific revision/modified between commits?
+		"skip-to": carapace.ActionFiles(), // TODO complete files of specific revision/modified between commits?
+	})
+
 	carapace.Gen(diffCmd).PositionalAnyCompletion(
 		actionDiffArgs(diffCmd),
 	)

completers/common/git_completer/cmd/diffFiles.go

@@ -27,7 +27,6 @@ func init() {
 	diffFilesCmd.Flags().Bool("log-size", false, "Print log message size in bytes before the message")
 	diffFilesCmd.Flags().Bool("mailmap", false, "Use mailmap file to map author and committer name")
 	diffFilesCmd.Flags().Bool("no-relative", false, "Do not show relative pathnames")
-	diffFilesCmd.Flags().Bool("no-textconv", false, "Disallow external text conversion filters to be run when comparing binary files")
 	diffFilesCmd.Flags().BoolS("q", "q", false, "Remain silent even for nonexistent files")
 	diffFilesCmd.Flags().String("rotate-to", "", "Move the files before the named <file> to the end")
 	diffFilesCmd.Flags().String("skip-to", "", "Discard the files before the named <file> from the output")

completers/common/git_completer/cmd/diffIndex.go

@@ -23,7 +23,6 @@ func init() {
 	diffIndexCmd.Flags().BoolS("m", "m", false, "make git diff-index say that all non-checked-out files are up to date")
 	diffIndexCmd.Flags().Bool("merge-base", false, "use the merge base between <tree-ish> and HEAD")
 	diffIndexCmd.Flags().Bool("no-relative", false, "do not make the output relative")
-	diffIndexCmd.Flags().Bool("no-textconv", false, "do not external text conversion filters to be run")
 	diffIndexCmd.Flags().Bool("quiet", false, "disable all output of the program")
 	diffIndexCmd.Flags().String("rotate-to", "", "move files before the named <file> to the end")
 	diffIndexCmd.Flags().String("skip-to", "", "discard the files before the named <file> from the output ")

completers/common/git_completer/cmd/diffTree.go

@@ -27,7 +27,6 @@ func init() {
 	diffTreeCmd.Flags().Bool("no-commit-id", false, "suppress commit ID output")
 	diffTreeCmd.Flags().Bool("no-notes", false, "do not show notes")
 	diffTreeCmd.Flags().Bool("no-relative", false, "do not show relative pathnames")
-	diffTreeCmd.Flags().Bool("no-textconv", false, "do not allow external text conversion filters")
 	diffTreeCmd.Flags().String("notes", "", "show the notes that annotate the commit")
 	diffTreeCmd.Flags().Bool("quiet", false, "disable all output of the program")
 	diffTreeCmd.Flags().BoolS("r", "r", false, "recurse into sub-trees")

completers/common/git_completer/cmd/log.go

@@ -45,7 +45,6 @@ func init() {
 	logCmd.Flags().Bool("no-mailmap", false, "Do not use mailmap file to map author and committer names and email addresses to canonical real names and email addresses.")
 	logCmd.Flags().Bool("no-notes", false, "Do not show notes.")
 	logCmd.Flags().Bool("no-relative", false, "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.")
-	logCmd.Flags().Bool("no-textconv", false, "Disallow external text conversion filters to be run when comparing binary files.")
 	logCmd.Flags().Bool("no-use-mailmap", false, "Do not use mailmap file to map author and committer names and email addresses to canonical real names and email addresses.")
 	logCmd.Flags().String("notes", "", "Show the notes that annotate the commit")
 	logCmd.Flags().Bool("reverse", false, "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with --walk-reflogs.")