From: Nguyễn Thái Ngọc Duy Date: Mon, 17 Feb 2014 12:15:31 GMT Subject: [PATCH v2 2/3] wt-status.c: move cut-line print code out to wt_status_add_cut_line Message-ID: <1392639332-7703-3-git-send-email-pclouds@gmail.com> In-Reply-To: <1392639332-7703-1-git-send-email-pclouds@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy --- wt-status.c | 19 ++++++++++++------- wt-status.h | 1 + 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/wt-status.c b/wt-status.c index 65e35c3..ed31b6a 100644 --- a/wt-status.c +++ b/wt-status.c @@ -808,6 +808,17 @@ void wt_status_truncate_message_at_cut_line(struct strbuf *buf) strbuf_release(&pattern); } +void wt_status_add_cut_line(FILE *fp) +{ + const char *explanation = _("Do not touch the line above.\nEverything below will be removed."); + struct strbuf buf = STRBUF_INIT; + + fprintf(fp, "%c %s", comment_line_char, cut_line); + strbuf_add_commented_lines(&buf, explanation, strlen(explanation)); + fputs(buf.buf, fp); + strbuf_release(&buf); +} + static void wt_status_print_verbose(struct wt_status *s) { struct rev_info rev; @@ -833,14 +844,8 @@ static void wt_status_print_verbose(struct wt_status *s) * diff before committing. */ if (s->fp != stdout) { - const char *explanation = _("Do not touch the line above.\nEverything below will be removed."); - struct strbuf buf = STRBUF_INIT; - rev.diffopt.use_color = 0; - fprintf(s->fp, "%c %s", comment_line_char, cut_line); - strbuf_add_commented_lines(&buf, explanation, strlen(explanation)); - fputs(buf.buf, s->fp); - strbuf_release(&buf); + wt_status_add_cut_line(s->fp); } run_diff_index(&rev, 1); } diff --git a/wt-status.h b/wt-status.h index 30a4812..b56ce3f 100644 --- a/wt-status.h +++ b/wt-status.h @@ -92,6 +92,7 @@ struct wt_status_state { }; void wt_status_truncate_message_at_cut_line(struct strbuf *); +void wt_status_add_cut_line(FILE *fp); void wt_status_prepare(struct wt_status *s); void wt_status_print(struct wt_status *s); void wt_status_collect(struct wt_status *s); -- 1.8.5.2.240.g8478abd