From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
git@vger.kernel.org
Subject: Re: jk/tag-contains (Re: What's cooking in git.git (Jul 2010, #05; Wed, 28))
Date: Mon, 02 Aug 2010 22:08:18 +0200 [thread overview]
Message-ID: <vpqk4o8bwwd.fsf@bauges.imag.fr> (raw)
In-Reply-To: <20100802200209.GD2180@burratino> (Jonathan Nieder's message of "Mon\, 2 Aug 2010 15\:02\:09 -0500")
Jonathan Nieder <jrnieder@gmail.com> writes:
> Junio C Hamano wrote:
>
>> You need to be careful here, though. What if you pulled from somebody
>> whose clock is set grossly in the future?
>
> We could check for that and give relevant advice:
>
> fatal: committer date <date> precedes parent date <date>
> hint: It looks like you are trying to commit on top of a commit
> hint: from 5 years into the future.
> hint: Use "git rebase -f" to rewrite the commit with a more
> hint: sensible date, and please, fix your clocks!
If the problem is the commit you've just pulled, I'd advise against
re-writing it: it's published, it's too late.
Be careful also: Git can hardly guess whether your clock is late, or
whether your co-worker's clock is in the future.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2010-08-02 20:09 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-29 4:00 What's cooking in git.git (Jul 2010, #05; Wed, 28) Junio C Hamano
2010-07-30 18:37 ` Jeff King
2010-07-31 6:07 ` jk/tag-contains (Re: What's cooking in git.git (Jul 2010, #05; Wed, 28)) Jonathan Nieder
2010-07-31 12:33 ` Jeff King
2010-08-02 4:04 ` Junio C Hamano
2010-08-02 20:02 ` Jonathan Nieder
2010-08-02 20:08 ` Matthieu Moy [this message]
2010-08-02 20:19 ` jk/tag-contains Jonathan Nieder
2010-08-02 22:38 ` jk/tag-contains Junio C Hamano
2010-08-05 17:56 ` jk/tag-contains (Re: What's cooking in git.git (Jul 2010, #05; Wed, 28)) Jeff King
2010-08-05 18:22 ` Junio C Hamano
2010-08-05 19:35 ` Jeff King
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=vpqk4o8bwwd.fsf@bauges.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
/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).