git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nanako Shiraishi <nanako3@lavabit.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Erick Mattos <erick.mattos@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH v2] commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
Date: Thu, 05 Nov 2009 12:34:56 +0900	[thread overview]
Message-ID: <20091105123456.6117@nanako3.lavabit.com> (raw)
In-Reply-To: <7vpr7ykbh8.fsf@alter.siamese.dyndns.org>

Quoting Junio C Hamano <gitster@pobox.com>

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

  parent reply	other threads:[~2009-11-05  3:35 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-04  3:20 [PATCH v2] commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author Erick Mattos
2009-11-04  7:14 ` Junio C Hamano
2009-11-04 16:45   ` Erick Mattos
2009-11-05  3:34   ` Nanako Shiraishi [this message]
2009-11-05  5:40     ` Junio C Hamano
2009-11-05 19:11       ` Erick Mattos

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20091105123456.6117@nanako3.lavabit.com \
    --to=nanako3@lavabit.com \
    --cc=erick.mattos@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).