Merge pull request #3263 from carapace-sh/git-diff-follow

git: fix `--follow` diff flag

Author: rsteube

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

@@ -37,6 +37,7 @@ func AddDiffFlags(cmd *cobra.Command) {
 	cmd.Flags().Bool("find-copies-harder", false, "inspect unmodified files as candidates for the source of copy")
 	cmd.Flags().String("find-object", "", "Look for differences that change the number of occurrences of the specified object")
 	cmd.Flags().StringP("find-renames", "M", "", "Detect renames")
+	cmd.Flags().String("follow", "", "Continue listing the history of a file beyond renames")
 	cmd.Flags().Bool("full-index", false, "show the full pre- and post-image blob object names")
 	cmd.Flags().BoolP("function-context", "W", false, "Show whole surrounding functions of changes")
 	cmd.Flags().Bool("histogram", false, "Generate a diff using the \"histogram diff\" algorithm")
@@ -61,6 +62,7 @@ func AddDiffFlags(cmd *cobra.Command) {
 	cmd.Flags().Bool("no-color-moved", false, "Turn off move detection")
 	cmd.Flags().Bool("no-color-moved-ws", false, "Do not ignore whitespace when performing move detection")
 	cmd.Flags().Bool("no-ext-diff", false, "Disallow external diff drivers")
+	cmd.Flags().Bool("no-follow", false, "Do not continue listing the history of a file beyond renames.")
 	cmd.Flags().Bool("no-indent-heuristic", false, "Disable the indent heuristic")
 	cmd.Flags().Bool("no-index", false, "Compare paths on the file system")
 	cmd.Flags().BoolP("no-patch", "s", false, "Suppress diff output")
@@ -107,11 +109,21 @@ func AddDiffFlags(cmd *cobra.Command) {
 	cmd.Flag("color-moved-ws").NoOptDefVal = " "
 	cmd.Flag("word-diff").NoOptDefVal = "plain"
 
+	cmd.MarkFlagsMutuallyExclusive("abbrev", "no-abbrev")
+	cmd.MarkFlagsMutuallyExclusive("color", "no-color")
+	cmd.MarkFlagsMutuallyExclusive("color-moved", "no-color-moved")
+	cmd.MarkFlagsMutuallyExclusive("color-moved-ws", "no-color-moved-ws")
+	cmd.MarkFlagsMutuallyExclusive("ext-diff", "no-ext-diff")
+	cmd.MarkFlagsMutuallyExclusive("follow", "no-follow")
+	cmd.MarkFlagsMutuallyExclusive("indent-heuristic", "no-indent-heuristic")
+	cmd.MarkFlagsMutuallyExclusive("patch", "no-patch")
+
 	carapace.Gen(cmd).FlagCompletion(carapace.ActionMap{
 		"color":              git.ActionColorModes(),
 		"color-moved":        git.ActionColorMovedModes(),
 		"color-moved-ws":     git.ActionColorMovedWsModes(),
 		"diff-algorithm":     git.ActionDiffAlgorithms(),
+		"follow":             carapace.ActionFiles(), // TODO complete files of specific revision/modified between commits?
 		"ignore-submodules":  carapace.ActionValues("none", "untracked", "dirty", "all"),
 		"output":             carapace.ActionFiles(),
 		"submodule":          carapace.ActionValues("short", "long", "log"),

completers/common/git_completer/cmd/diff.go

@@ -22,7 +22,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().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")
@@ -31,7 +30,6 @@ func init() {
 	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?
 	})
 

completers/common/git_completer/cmd/diffFiles.go

@@ -20,7 +20,6 @@ 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("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().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")

completers/common/git_completer/cmd/log.go

@@ -32,15 +32,13 @@ func init() {
 	logCmd.Flags().Bool("dense", false, "Only the selected commits are shown")
 	logCmd.Flags().String("diff-merges", "", "Specify diff format to be used for merge commits.")
 	logCmd.Flags().Bool("early-output", false, "undocumented")
-	logCmd.Flags().Bool("follow", false, "Continue listing the history of a file beyond renames.")
 	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().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.")
 	logCmd.Flags().Bool("no-diff-merges", false, "Specify diff format to be used for merge commits.")
-	logCmd.Flags().Bool("no-follow", false, "Do not continue listing the history of a file beyond renames.")
 	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.")