diff-index: restore -c/--cc options handling

This fixes 19b2517f (diff-merges: move specific diff-index "-m"
handling to diff-index, 2021-05-21).

That commit disabled handling of all diff for merges options in
diff-index on an assumption that they are unused. However, it later
appeared that -c and --cc, even though undocumented and not being
covered by tests, happen to have had particular effect on diff-index
output.

Restore original -c/--cc options handling by diff-index.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/diff-index.c b/builtin/diff-index.c
index cf09559e422d66a06936eef050203498f00f4559..5fd23ab5b6c5b634be82e91339d4920fe9e15b99 100644 (file)
--- a/builtin/diff-index.c
+++ b/builtin/diff-index.c
@@ -29,10 +29,10 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
        prefix = precompose_argv_prefix(argc, argv, prefix);
 
        /*
-        * We need no diff for merges options, and we need to avoid conflict
-        * with our own meaning of "-m".
+        * We need (some of) diff for merges options (e.g., --cc), and we need
+        * to avoid conflict with our own meaning of "-m".
         */
-       diff_merges_suppress_options_parsing();
+       diff_merges_suppress_m_parsing();
 
        argc = setup_revisions(argc, argv, &rev, NULL);
        for (i = 1; i < argc; i++) {

diff --git a/diff-merges.c b/diff-merges.c
index d897fd8a293319b34172c5c816d28ffb37ad7ce9..5060ccd890bd307b1276e367e3b70872718e3af7 100644 (file)
--- a/diff-merges.c
+++ b/diff-merges.c
@@ -6,7 +6,7 @@ typedef void (*diff_merges_setup_func_t)(struct rev_info *);
 static void set_separate(struct rev_info *revs);
 
 static diff_merges_setup_func_t set_to_default = set_separate;
-static int suppress_parsing;
+static int suppress_m_parsing;
 
 static void suppress(struct rev_info *revs)
 {
@@ -91,9 +91,9 @@ int diff_merges_config(const char *value)
        return 0;
 }
 
-void diff_merges_suppress_options_parsing(void)
+void diff_merges_suppress_m_parsing(void)
 {
-       suppress_parsing = 1;
+       suppress_m_parsing = 1;
 }
 
 int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
@@ -102,10 +102,7 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
        const char *optarg;
        const char *arg = argv[0];
 
-       if (suppress_parsing)
-               return 0;
-
-       if (!strcmp(arg, "-m")) {
+       if (!suppress_m_parsing && !strcmp(arg, "-m")) {
                set_to_default(revs);
        } else if (!strcmp(arg, "-c")) {
                set_combined(revs);
@@ -153,9 +150,6 @@ void diff_merges_set_dense_combined_if_unset(struct rev_info *revs)
 
 void diff_merges_setup_revs(struct rev_info *revs)
 {
-       if (suppress_parsing)
-               return;
-
        if (revs->combine_merges == 0)
                revs->dense_combined_merges = 0;
        if (revs->separate_merges == 0)

diff --git a/diff-merges.h b/diff-merges.h
index b5d57f6563e3ab8323e4091201aeb62b4a5530d1..19639689bb05f7b241f37a22ad16e83d1d0be8db 100644 (file)
--- a/diff-merges.h
+++ b/diff-merges.h
@@ -11,7 +11,7 @@ struct rev_info;
 
 int diff_merges_config(const char *value);
 
-void diff_merges_suppress_options_parsing(void);
+void diff_merges_suppress_m_parsing(void);
 
 int diff_merges_parse_opts(struct rev_info *revs, const char **argv);