Re: jk/tag-contains (Re: What's cooking in git.git (Jul 2010, #05; Wed, 28))

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Aug 2, 2010, 20:08 UTC
Message-ID: <vpqk4o8bwwd.fsf@bauges.imag.fr>
In-Reply-To: <20100802200209.GD2180@burratino>

Jonathan Nieder <jrnieder@gmail.com> writes:

Show 12 quoted lines

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