From: "Stephen C. Tweedie" <sct@redhat.com>
To: "Randal L. Schwartz" <merlyn@stonehenge.com>
Cc: Stephen Tweedie <sct@redhat.com>, git@vger.kernel.org
Subject: Re: rsync update appears broken now
Date: Thu, 20 Oct 2005 11:03:00 -0400 [thread overview]
Message-ID: <1129820581.3298.7.camel@orbit.scot.redhat.com> (raw)
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 <junkio@cox.net>
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 <junkio@cox.net>
commit f8765797a41a39f4dfc7030098c38283e6461a83
Author: Junio C Hamano <junkio@cox.net>
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 <junkio@cox.net>
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
prev parent reply other threads:[~2005-10-20 15:03 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-20 12:47 rsync update appears broken now Randal L. Schwartz
2005-10-20 13:08 ` Alex Riesen
2005-10-20 14:12 ` Randal L. Schwartz
2005-10-20 14:24 ` Alex Riesen
2005-10-20 17:48 ` Linus Torvalds
2005-10-20 20:48 ` Junio C Hamano
2005-10-20 21:32 ` Linus Torvalds
2005-10-20 23:37 ` Junio Hamano
2005-10-20 23:41 ` Johannes Schindelin
2005-10-20 23:49 ` Linus Torvalds
2005-10-21 0:01 ` Johannes Schindelin
2005-10-21 0:19 ` Linus Torvalds
2005-10-21 0:34 ` Petr Baudis
2005-10-20 23:47 ` Linus Torvalds
2005-10-21 0:26 ` Junio C Hamano
2005-10-21 0:52 ` Linus Torvalds
2005-10-21 13:49 ` Randal L. Schwartz
2005-10-21 15:26 ` Linus Torvalds
2005-10-20 14:15 ` Morten Welinder
2005-10-20 18:03 ` dave morgan
2005-10-20 15:03 ` Stephen C. Tweedie [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=1129820581.3298.7.camel@orbit.scot.redhat.com \
--to=sct@redhat.com \
--cc=git@vger.kernel.org \
--cc=merlyn@stonehenge.com \
/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).