Documentation: typofix --column description

[thirdparty/git.git] / add-patch.c

diff --git a/add-patch.c b/add-patch.c
index be4cf6e9e5d733e477737be5d5a77fe3ccf48e24..2fad92ca373292f328d5e5de4584638faa7bbd45 100644 (file)
--- a/add-patch.c
+++ b/add-patch.c
@@ -661,13 +661,18 @@ static void render_hunk(struct add_p_state *s, struct hunk *hunk,
                else
                        new_offset += delta;
 
-               strbuf_addf(out, "@@ -%lu,%lu +%lu,%lu @@",
-                           old_offset, header->old_count,
-                           new_offset, header->new_count);
+               strbuf_addf(out, "@@ -%lu", old_offset);
+               if (header->old_count != 1)
+                       strbuf_addf(out, ",%lu", header->old_count);
+               strbuf_addf(out, " +%lu", new_offset);
+               if (header->new_count != 1)
+                       strbuf_addf(out, ",%lu", header->new_count);
+               strbuf_addstr(out, " @@");
+
                if (len)
                        strbuf_add(out, p, len);
                else if (colored)
-                       strbuf_addf(out, "%s\n", GIT_COLOR_RESET);
+                       strbuf_addf(out, "%s\n", s->s.reset_color);
                else
                        strbuf_addch(out, '\n');
        }
@@ -1060,7 +1065,7 @@ static void recolor_hunk(struct add_p_state *s, struct hunk *hunk)
                              s->s.file_new_color :
                              s->s.context_color);
                strbuf_add(&s->colored, plain + current, eol - current);
-               strbuf_addstr(&s->colored, GIT_COLOR_RESET);
+               strbuf_addstr(&s->colored, s->s.reset_color);
                if (next > eol)
                        strbuf_add(&s->colored, plain + eol, next - eol);
                current = next;
@@ -1456,15 +1461,15 @@ static int patch_update_file(struct add_p_state *s,
                else
                        prompt_mode_type = PROMPT_HUNK;
 
-               color_fprintf(stdout, s->s.prompt_color,
-                             "(%"PRIuMAX"/%"PRIuMAX") ",
+               printf("%s(%"PRIuMAX"/%"PRIuMAX") ", s->s.prompt_color,
                              (uintmax_t)hunk_index + 1,
                              (uintmax_t)(file_diff->hunk_nr
                                                ? file_diff->hunk_nr
                                                : 1));
-               color_fprintf(stdout, s->s.prompt_color,
-                             _(s->mode->prompt_mode[prompt_mode_type]),
-                             s->buf.buf);
+               printf(_(s->mode->prompt_mode[prompt_mode_type]),
+                      s->buf.buf);
+               if (*s->s.reset_color)
+                       fputs(s->s.reset_color, stdout);
                fflush(stdout);
                if (read_single_character(s) == EOF)
                        break;