Merge pull request #3262 from carapace-sh/git-diff-flags

git: add missing diff flags

Author: rsteube

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

@@ -25,6 +25,7 @@ func AddDiffFlags(cmd *cobra.Command) {
 	cmd.Flags().String("color-words", "", "Equivalent to --word-diff=color plus (if a regex was specified)")
 	cmd.Flags().Bool("compact-summary", false, "Output a condensed summary of extended header information")
 	cmd.Flags().Bool("cumulative", false, "Synonym for --dirstat=cumulative")
+	cmd.Flags().Bool("default-prefix", false, "Use the default source and destination prefixes")
 	cmd.Flags().String("diff-algorithm", "", "")
 	cmd.Flags().String("diff-filter", "", "filter files")
 	cmd.Flags().StringP("dirstat", "X", "", "Output the distribution of relative amount of changes for each sub-directory")
@@ -42,6 +43,7 @@ func AddDiffFlags(cmd *cobra.Command) {
 	cmd.Flags().BoolP("ignore-all-space", "w", false, "Ignore whitespace when comparing lines")
 	cmd.Flags().Bool("ignore-blank-lines", false, "Ignore changes whose lines are all blank")
 	cmd.Flags().Bool("ignore-cr-at-eol", false, "Ignore carriage-return at the end of line when doing a comparison")
+	cmd.Flags().StringP("ignore-matching-lines", "I", "", "Ignore changes whose all lines match <regex>")
 	cmd.Flags().Bool("ignore-space-at-eol", false, "Ignore changes in whitespace at EOL")
 	cmd.Flags().BoolP("ignore-space-change", "b", false, "Ignore changes in amount of whitespace")
 	cmd.Flags().String("ignore-submodules", "", "Ignore changes to submodules in the diff generation")

completers/common/git_completer/cmd/diff.go

@@ -23,7 +23,6 @@ func init() {
 	// 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")

completers/common/git_completer/cmd/diffFiles.go

@@ -19,11 +19,9 @@ func init() {
 
 	diffFilesCmd.Flags().StringS("G", "G", "", "Look for differences whose patch text contains added/removed lines that match <regex>")
 	diffFilesCmd.Flags().Bool("default", false, "Use argument as default revision")
-	diffFilesCmd.Flags().Bool("default-prefix", false, "Use the default source and destination prefixes")
 	diffFilesCmd.Flags().Bool("early-output", false, "undocumented")
 	diffFilesCmd.Flags().Bool("follow", false, "Continue listing the history of a file beyond renames")
 	diffFilesCmd.Flags().Bool("full-diff", false, "Show full commit diffs")
-	diffFilesCmd.Flags().StringP("ignore-matching-lines", "I", "", "Ignore changes whose all lines match <regex>")
 	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")

completers/common/git_completer/cmd/diffIndex.go

@@ -18,8 +18,6 @@ func init() {
 	carapace.Gen(diffIndexCmd).Standalone()
 
 	diffIndexCmd.Flags().StringS("G", "G", "", "look for differences whose patch text contains added/removed lines that match <regex>")
-	diffIndexCmd.Flags().Bool("default-prefix", false, "use the default source and destination prefixes")
-	diffIndexCmd.Flags().StringP("ignore-matching-lines", "I", "", "ignore changes whose all lines match <regex>")
 	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")

completers/common/git_completer/cmd/diffTree.go

@@ -20,8 +20,6 @@ func init() {
 	diffTreeCmd.Flags().StringS("G", "G", "", "look for differences whose patch text contains added/removed lines that match <regex>")
 	diffTreeCmd.Flags().Bool("always", false, "show the commit itself and the commit log message even if the diff itself is empty")
 	diffTreeCmd.Flags().Bool("combined-all-paths", false, "let combined diffs list the name of the file from all parents")
-	diffTreeCmd.Flags().Bool("default-prefix", false, "use the default source and destination prefixes")
-	diffTreeCmd.Flags().StringP("ignore-matching-lines", "I", "", "ignore changes whose all lines match <regex>")
 	diffTreeCmd.Flags().BoolS("m", "m", false, "show differences for merge commits")
 	diffTreeCmd.Flags().Bool("merge-base", false, "use the merge base between the two <tree-ish>s as the \"before\" side")
 	diffTreeCmd.Flags().Bool("no-commit-id", false, "suppress commit ID output")

completers/common/git_completer/cmd/log.go

@@ -36,7 +36,6 @@ func init() {
 	logCmd.Flags().Bool("full-diff", false, "With this, the full diff is shown for commits that touch the specified paths")
 	logCmd.Flags().Bool("full-history", false, "Same as the default mode, but does not prune some history.")
 	logCmd.Flags().BoolP("help", "h", false, "Show help.")
-	logCmd.Flags().StringP("ignore-matching-lines", "I", "", "Ignore changes whose all lines match <regex>.")
 	logCmd.Flags().Bool("log-size", false, "Include a line “log size <number>” in the output for each commit.")
 	logCmd.Flags().Bool("mailmap", false, "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses.")
 	logCmd.Flags().Bool("no-decorate", false, "Print out the ref names of any commits that are shown.")