diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-02-17 19:15:31 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-02-18 15:50:40 -0800 |
| commit | fcef9312a4ad3d94bfa2d02c41e46eb6adcde9b1 (patch) | |
| tree | d3cb6540ff3bb67f996fb9b19c19cdc7a988c21f | |
| parent | wt-status.c: make cut_line[] const to shrink .data section a bit (diff) | |
| download | tgif-fcef9312a4ad3d94bfa2d02c41e46eb6adcde9b1.tar.xz | |
wt-status.c: move cut-line print code out to wt_status_add_cut_line
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | wt-status.c | 19 | ||||
| -rw-r--r-- | wt-status.h | 1 |
2 files changed, 13 insertions, 7 deletions
diff --git a/wt-status.c b/wt-status.c index 65e35c30ac..ed31b6afbe 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 30a4812583..b56ce3f035 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); |