Re: [PATCH v2 ] commit -v: strip diffs and submodule shortlogs from the commit message

2013-11-19 Thread Jens Lehmann
Am 19.11.2013 21:34, schrieb Junio C Hamano: > Jens Lehmann writes: > >> Am 18.11.2013 17:01, schrieb Junio C Hamano: >>> Jeff King writes: >>> I found this hard to parse, I think because of the "keeping" (why would I not keep it?), and because you are talking about lines above and >>>

Re: [PATCH v2 ] commit -v: strip diffs and submodule shortlogs from the commit message

2013-11-19 Thread Junio C Hamano
Jens Lehmann writes: > Am 18.11.2013 17:01, schrieb Junio C Hamano: >> Jeff King writes: >> >>> I found this hard to parse, I think because of the "keeping" (why would >>> I not keep it?), and because you are talking about lines above and >>> below. It is not as accurate to say: >>> >>> # ---

Re: [PATCH v2 ] commit -v: strip diffs and submodule shortlogs from the commit message

2013-11-19 Thread Junio C Hamano
Junio C Hamano writes: > Jens Lehmann writes: > >> diff --git a/wt-status.h b/wt-status.h >> index 6c29e6f..cd2709f 100644 >> --- a/wt-status.h >> +++ b/wt-status.h >> @@ -91,6 +91,8 @@ struct wt_status_state { >> unsigned char cherry_pick_head_sha1[20]; >> }; >> >> +const char wt_status_d

Re: [PATCH v2 ] commit -v: strip diffs and submodule shortlogs from the commit message

2013-11-19 Thread Junio C Hamano
Jens Lehmann writes: > diff --git a/wt-status.h b/wt-status.h > index 6c29e6f..cd2709f 100644 > --- a/wt-status.h > +++ b/wt-status.h > @@ -91,6 +91,8 @@ struct wt_status_state { > unsigned char cherry_pick_head_sha1[20]; > }; > > +const char wt_status_diff_divider[]; This gives me: ./wt

Re: [PATCH v2 ] commit -v: strip diffs and submodule shortlogs from the commit message

2013-11-19 Thread Junio C Hamano
Jens Lehmann writes: > When using the '-v' option of "git commit" the diff added to the commit > message temporarily for editing is stripped off after the user exited the > editor by searching for "\ndiff --git " and truncating the commmit message > there if it is found. But this approach has two

[PATCH v2 ] commit -v: strip diffs and submodule shortlogs from the commit message

2013-11-19 Thread Jens Lehmann
When using the '-v' option of "git commit" the diff added to the commit message temporarily for editing is stripped off after the user exited the editor by searching for "\ndiff --git " and truncating the commmit message there if it is found. But this approach has two problems: when the commit mess