Re: [PATCH v2] commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
From: Nanako Shiraishi <hidden>
Date: 2016-06-15 22:47:40
Quoting Junio C Hamano [off-list ref]
I had an impression that we have already established that setting the author with --author="Somebody Else <s@b.e>" and committing with the current time does not make much sense from the workflow point of view long time ago in this thread. <snip> But allowing this combination, even though it might not make much sense, is just giving extra length to the rope, so it may not be such a big deal.
It may be wise to forbid a combination of options if it encourages mistakes or a wrong workflow, but I don't think using --author and --reset-author with 'git commit --amend' is such a case. Imagine somebody other than you (eg. me) were the maintainer, and a message by Szeder was sent with a good commit log message. http://article.gmane.org/gmane.comp.version-control.git/132029 Then you sent a replacement patch that solves the same problem in a more elegant way, but without anything that is usable as the commit log message. http://article.gmane.org/gmane.comp.version-control.git/132041 If I were the maintainer, I would find it very convenient if I can work like this: % git am -s 132029 --- first I apply Szeder's version Then I see your message. Replace the code change but use Szeder's log message. % git reset --hard HEAD^ % git am 132041 --- your version with no usable log message % git commit --amend -s -c @{2} --author='Junio C Hamano <...>'
Sorry, but I cannot help feeling a bit frustrated and mildly irritated.
Don't try to be perfect and feel stressed out, and please take a good rest. -- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/