commit: --amend -m '' silently fails to wipe message

diff --git a/combine-diff.c b/combine-diff.c
index 284bec6ad50de768f04a66d738d3655eff64a2c4..5cae5fbd62180e08709d404cbf357adceb1d4d06 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -732,7 +732,7 @@ static void dump_sline(struct sline *sline, const char *line_prefix,
        const char *c_func = diff_get_color(use_color, DIFF_FUNCINFO);
        const char *c_new = diff_get_color(use_color, DIFF_FILE_NEW);
        const char *c_old = diff_get_color(use_color, DIFF_FILE_OLD);
-       const char *c_plain = diff_get_color(use_color, DIFF_PLAIN);
+       const char *c_context = diff_get_color(use_color, DIFF_CONTEXT);
        const char *c_reset = diff_get_color(use_color, DIFF_RESET);
 
        if (result_deleted)
@@ -795,7 +795,7 @@ static void dump_sline(struct sline *sline, const char *line_prefix,
                        }
                        if (comment_end)
                                printf("%s%s %s%s", c_reset,
-                                                   c_plain, c_reset,
+                                                   c_context, c_reset,
                                                    c_func);
                        for (i = 0; i < comment_end; i++)
                                putchar(hunk_comment[i]);
@@ -830,7 +830,7 @@ static void dump_sline(struct sline *sline, const char *line_prefix,
                                 */
                                if (!context)
                                        continue;
-                               fputs(c_plain, stdout);
+                               fputs(c_context, stdout);
                        }
                        else
                                fputs(c_new, stdout);