Re: [RFC PATCH 1/2] commit: don't add scissors line if one exists

2018-11-15 Thread Junio C Hamano
Denton Liu writes: >> If the current invocation of "git commit" added a scissors line in >> the buffer to be edited already, and we are adding another one in >> this function, is it possible that the real problem that somebody >> else has called wt_status_add_cut_line() before this function is

Re: [RFC PATCH 1/2] commit: don't add scissors line if one exists

2018-11-14 Thread Denton Liu
On Wed, Nov 14, 2018 at 05:06:32PM +0900, Junio C Hamano wrote: > Denton Liu writes: > > > If commit.cleanup = scissors is specified, don't produce a scissors line > > if one already exists in the commit message. > > It is good that you won't have two such lines in the end result, but > is this

Re: [RFC PATCH 1/2] commit: don't add scissors line if one exists

2018-11-14 Thread Junio C Hamano
Denton Liu writes: > If commit.cleanup = scissors is specified, don't produce a scissors line > if one already exists in the commit message. It is good that you won't have two such lines in the end result, but is this (1) hiding real problem under the rug? (2) losing information? If the

[RFC PATCH 1/2] commit: don't add scissors line if one exists

2018-11-13 Thread Denton Liu
If commit.cleanup = scissors is specified, don't produce a scissors line if one already exists in the commit message. Signed-off-by: Denton Liu --- builtin/commit.c | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index