From: Stephen C. Tweedie Date: Thu, 20 Oct 2005 15:03:00 GMT Subject: Re: rsync update appears broken now Message-ID: <1129820581.3298.7.camel@orbit.scot.redhat.com> In-Reply-To: <86vezs9wy9.fsf@blue.stonehenge.com> Hi, On Thu, 2005-10-20 at 05:47 -0700, Randal L. Schwartz wrote: > Doing my daily git-pull now broke in this way (using yesterday's git version): > ... > * committish: 6e1c6c103c522d01829f3a63992a023ff031e851 > branch 'master' of rsync://rsync.kernel.org/pub/scm/git/git > * refs/heads/origin: does not fast forward to branch 'master' of rsync://rsync.kernel.org/pub/scm/git/git; > not updating. Seen here too. My HEAD and HEAD^ as of yesterday's pull was: commit ea5a65a59916503d2a14369c46b1023384d51645 Author: Junio C Hamano Date: Tue Oct 18 18:42:19 2005 -0700 Do not ask for objects known to be complete. On top of optimization by Linus not to ask refs that already match, we can walk our refs and not issue "want" for things that are known to be reachable from them. Signed-off-by: Junio C Hamano commit f8765797a41a39f4dfc7030098c38283e6461a83 Author: Junio C Hamano Date: Tue Oct 18 18:42:14 2005 -0700 Even when overwriting tags, report if they are changed or not. Signed-off-by: Junio C Hamano Today, looking at git-web I can see that that HEAD^ commit is still there, but yesterday's HEAD is simply not in the commit chain any more: there are a couple of other commits and then the "Do not ask for objects known to be complete" commit appears with SHA 49bb805e69f97e75472e54a68e9eb24e08dee011. Somebody broke this by rsyncing a non-superset tree to kernel.org, maybe? "git reset --hard HEAD^" got rid of the missing HEAD commit and allowed me to pull from the new commit chain, but that really shouldn't be necessary. --Stephen