mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/commit-editor-cleanup'

Browse Source 
"git commit --cleanup=<mode>" learned a new mode, scissors.

* nd/commit-editor-cleanup:
  commit: add --cleanup=scissors
  wt-status.c: move cut-line print code out to wt_status_add_cut_line
  wt-status.c: make cut_line[] const to shrink .data section a bit
This commit is contained in:
Junio C Hamano
2014-03-25 11:07:47 -07:00
parent d4c6e9fb6f 75df1f434f
commit 46c0f913a4
5 changed files with 48 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wt-status.c
View File

@ -17,7 +17,7 @@
#include "strbuf.h"
#include "utf8.h"
static char cut_line[] =
static const char cut_line[] =
"------------------------ >8 ------------------------\n";
static char default_wt_status_colors[][COLOR_MAXLEN] = {
@ -841,6 +841,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;
@ -866,14 +877,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);
}