From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Mar 2014 18:07:47 +0000 (-0700)
Subject: Merge branch 'nd/commit-editor-cleanup'
X-Git-Tag: v2.0.0-rc0~67
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/46c0f913a49218a8a94d30c5a2df792a16aab827?ds=inline;hp=--cc

Merge branch 'nd/commit-editor-cleanup'

"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
---

46c0f913a49218a8a94d30c5a2df792a16aab827
diff --cc builtin/commit.c
index 3783bcadcd,1033c500d2..38f34e7cd3
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@@ -752,10 -754,10 +753,12 @@@ static int prepare_to_commit(const cha
  	/* This checks if committer ident is explicitly given */
  	strbuf_addstr(&committer_ident, git_committer_info(IDENT_STRICT));
  	if (use_editor && include_status) {
 +		int ident_shown = 0;
 +		int saved_color_setting;
  		char *ai_tmp, *ci_tmp;
- 		if (whence != FROM_COMMIT)
+ 		if (whence != FROM_COMMIT) {
+ 			if (cleanup_mode == CLEANUP_SCISSORS)
+ 				wt_status_add_cut_line(s->fp);
  			status_printf_ln(s, GIT_COLOR_NORMAL,
  			    whence == FROM_MERGE
  				? _("\n"