Re: [PATCH] sequencer: preserve commit messages

2015-02-27 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: Without any config being set the result is certainly what I'm after. What I'm still wondering about is the case without --edit but with commit.cleanup: It seems to me that git commit being involved in a conflict-less cherry-pick is solely an

Re: [PATCH] sequencer: preserve commit messages

2015-02-27 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 26.02.2015 20:49: Michael J Gruber g...@drmicha.warpmail.net writes: Hmm. With --edit, current config being in effect should be expected, right? So how about: In case of no conflict: force cleanup=verbatim unless --edit is used? Perhaps something like

Re: [PATCH] sequencer: preserve commit messages

2015-02-26 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 25.02.2015 19:22: Michael J Gruber g...@drmicha.warpmail.net writes: Junio C Hamano venit, vidit, dixit 24.02.2015 19:29: Michael J Gruber g...@drmicha.warpmail.net writes: Hmm, wouldn't it introduce a grave regression for users who explicitly ask to

Re: [PATCH] sequencer: preserve commit messages

2015-02-25 Thread Christoph Anton Mitterer
On Tue, 2015-02-24 at 10:29 -0800, Junio C Hamano wrote: Hmm, but if it does not, wouldn't that countermand the wish of the user who explicitly asked to clean crufty messages up by setting their own commit.cleanup configuration? IMHO it's just wrong behaviour if the commit messages of people

Re: [PATCH] sequencer: preserve commit messages

2015-02-25 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: Junio C Hamano venit, vidit, dixit 24.02.2015 19:29: Michael J Gruber g...@drmicha.warpmail.net writes: Hmm, wouldn't it introduce a grave regression for users who explicitly ask to clean crufty messages up (by setting their own

Re: [PATCH] sequencer: preserve commit messages

2015-02-25 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 24.02.2015 19:29: Michael J Gruber g...@drmicha.warpmail.net writes: Hmm, wouldn't it introduce a grave regression for users who explicitly ask to clean crufty messages up (by setting their own commit.cleanup configuration) if you unconditionally force

Re: [PATCH] sequencer: preserve commit messages

2015-02-24 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 23.02.2015 19:54: Michael J Gruber g...@drmicha.warpmail.net writes: sequencer calls commit with default options, which implies --cleanup=default unless the user specified something else in their config. This leads to cherry-picked commits getting a cleaned

Re: [PATCH] sequencer: preserve commit messages

2015-02-24 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: Hmm, wouldn't it introduce a grave regression for users who explicitly ask to clean crufty messages up (by setting their own commit.cleanup configuration) if you unconditionally force --cleanup=verbatim here? That's what I meant by

[PATCH] sequencer: preserve commit messages

2015-02-23 Thread Michael J Gruber
sequencer calls commit with default options, which implies --cleanup=default unless the user specified something else in their config. This leads to cherry-picked commits getting a cleaned up commit message, which is usually not an intended side-effect. Make the sequencer use --cleanup=verbatim

Re: [PATCH] sequencer: preserve commit messages

2015-02-23 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: sequencer calls commit with default options, which implies --cleanup=default unless the user specified something else in their config. This leads to cherry-picked commits getting a cleaned up commit message, which is usually not an intended