Re: unable to pull from remote if commit date is in the future

2016-06-20 Thread Andreas Schwab
Norbert Kiesel writes: > For the record: the faulty commit is > https://github.com/seandepagnier/weather_routing_pi/commit/23c07cc5d2be7ce68349f4b3719b6fa6fe90e0bf That commit is part of master. Are you sure you don't have it already? Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key

Re: unable to pull from remote if commit date is in the future

2016-06-20 Thread Jeff King
On Mon, Jun 20, 2016 at 09:49:47PM +0200, Eric Deplagne wrote: > On Mon, 20 Jun 2016 15:39:28 -0400, Jeff King wrote: > > On Mon, Jun 20, 2016 at 12:05:07PM -0700, Norbert Kiesel wrote: > > > > > Hmm. On closer inspection that commit 23c07cc that github shows with > > > date 2152-06-19 is alread

Re: unable to pull from remote if commit date is in the future

2016-06-20 Thread Jeff King
On Mon, Jun 20, 2016 at 03:46:49PM -0400, Jeff King wrote: > So to answer my own questions: > > $ git cat-file commit 23c07cc | egrep '^author|committer' > author Sean D'Epagnier 5758122296 -40643156 > committer Sean D'Epagnier 5758122296 -40643156 > > Yes, the timezone really is that ri

Re: unable to pull from remote if commit date is in the future

2016-06-20 Thread Eric Deplagne
On Mon, 20 Jun 2016 15:39:28 -0400, Jeff King wrote: > On Mon, Jun 20, 2016 at 12:05:07PM -0700, Norbert Kiesel wrote: > > > Hmm. On closer inspection that commit 23c07cc that github shows with > > date 2152-06-19 is already in my local branch. I got confused because > > locally it is shown with

Re: unable to pull from remote if commit date is in the future

2016-06-20 Thread Jeff King
On Mon, Jun 20, 2016 at 03:39:28PM -0400, Jeff King wrote: > On Mon, Jun 20, 2016 at 12:05:07PM -0700, Norbert Kiesel wrote: > > > Hmm. On closer inspection that commit 23c07cc that github shows with > > date 2152-06-19 is already in my local branch. I got confused because > > locally it is sho

Re: unable to pull from remote if commit date is in the future

2016-06-20 Thread Norbert Kiesel
On Mon, Jun 20, 2016 at 12:39 PM, Jeff King wrote: > git cat-file commit 23c07cc | egrep '^author|committer' author Sean D'Epagnier 5758122296 -40643156 committer Sean D'Epagnier 5758122296 -40643156 date --date='@5758122296' returns "Mon Jun 19 15:24:56 PDT 2152" which is what is shown by git

Re: unable to pull from remote if commit date is in the future

2016-06-20 Thread Jeff King
On Mon, Jun 20, 2016 at 12:05:07PM -0700, Norbert Kiesel wrote: > Hmm. On closer inspection that commit 23c07cc that github shows with > date 2152-06-19 is already in my local branch. I got confused because > locally it is shown with a different date: `git log -1 --format='%ci' > 23c07cc` shows

Re: unable to pull from remote if commit date is in the future

2016-06-20 Thread Stefan Beller
On Mon, Jun 20, 2016 at 11:41 AM, Norbert Kiesel wrote: > Hi, > > I'm following an upstream repo on github. Today morning I saw a new > commit there, but a `git pull` in my clone did not fetch it and > instead said "Already up-to-date.". On closer inspection, github > reports commit time as 2152

Re: unable to pull from remote if commit date is in the future

2016-06-20 Thread Norbert Kiesel
Hmm. On closer inspection that commit 23c07cc that github shows with date 2152-06-19 is already in my local branch. I got confused because locally it is shown with a different date: `git log -1 --format='%ci' 23c07cc` shows "2106-02-07 06:28:56 -40643156" which is invalid. My system is running D

unable to pull from remote if commit date is in the future

2016-06-20 Thread Norbert Kiesel
Hi, I'm following an upstream repo on github. Today morning I saw a new commit there, but a `git pull` in my clone did not fetch it and instead said "Already up-to-date.". On closer inspection, github reports commit time as 2152-06-19. The same project has some other commits with commit time in