git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yann Droneaud <ydroneaud@opteya.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Andreas Schwab <schwab@linux-m68k.org>,
	git@vger.kernel.org, Yann Droneaud <ydroneaud@opteya.com>
Subject: Re: git merge --date --author
Date: Mon, 10 Mar 2014 13:52:52 +0100	[thread overview]
Message-ID: <1394455972.3257.51.camel@localhost.localdomain> (raw)
In-Reply-To: <xmqqvbvpu757.fsf@gitster.dls.corp.google.com>

Hi,

Le vendredi 07 mars 2014 à 11:43 -0800, Junio C Hamano a écrit :
> Andreas Schwab <schwab@linux-m68k.org> writes:
> 
> > Yann Droneaud <ydroneaud@opteya.com> writes:
> >
> >> But I'd like to know if there's a specific reason for git merge to not
> >> support --date and --author ?
> >
> > It's rather unusual that a merge is performed on behalf of a different
> > author.
> 
> Yes.  Michael's "Nobody bothered to implement it" is also correct
> but the reason why nobody bothered to most likely is due to "why
> would you want to lie?".
> 

When was Git changed in some kind of TSA agent one has to bribe to get
allowed to cross^Wcommit ? Why git lawyer is not implemented ? I want a
fair trial !

And before adding to Git a perfect lie detector (how will it able to
make the difference between truth and lie ? then, will it be able to
make the difference between good and bad ?, oh god, no !), I would
prefer to have it detect bugs before one could commit instead.

You seems to think I'm lying, but I'm not a liar: I just need to make
some arrangements with the history under another identity, as I could be
legally bound to. So it may sound like a lie for you, but ultimately,
it's the plain truth.

So as the tool is not in position to distinguish lie from truth, I'd
prefer to not see this concept brought here.

> If the use case is to rebuild history, you would need to be able to
> also lie about the committer, so
> 
> >> git merge \
> >>     --date "2013-12-31 23:59:59 +0000" \
> >>     --author "Happy New Year <happy.new-year@gregorian.calendar>" \
> >>     current-year
> 
> in such a history-rebuild script would not be sufficient.  The
> script can set necessary environment variables to lie about both
> author and commiter, though, of course.
> 

Thanks for reminding this: I have to use GIT_COMMITER_DATE,
GIT_COMMITER_NAME and GIT_COMMITER_EMAIL.

As I'm not calling for adding --date and --author, I will continue to
use the environment variables: they're good enough for the job.

Regards.

-- 
Yann Droneaud
OPTEYA

      reply	other threads:[~2014-03-10 12:53 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-07 10:30 git merge --date --author Yann Droneaud
2014-03-07 11:41 ` Michael Haggerty
2014-03-07 12:58 ` Andreas Schwab
2014-03-07 19:43   ` Junio C Hamano
2014-03-10 12:52     ` Yann Droneaud [this message]

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=1394455972.3257.51.camel@localhost.localdomain \
    --to=ydroneaud@opteya.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=schwab@linux-m68k.org \
    /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).