Re: rsync update appears broken now

From: Linus Torvalds <torvalds@osdl.org>
Date: Oct 21, 2005, 15:26 UTC
Message-ID: <Pine.LNX.4.64.0510210822380.10477@g5.osdl.org>
In-Reply-To: <861x2fdloj.fsf@blue.stonehenge.com>

On Fri, 21 Oct 2005, Randal L. Schwartz wrote:

Show 8 quoted lines

> 
> Doesn't yet work for me.  What do I need to do now?
> 
>     * committish: 4ae22d96fe9248dac4f26b1fc91154ba5e879799
>       branch 'master' of rsync://rsync.kernel.org/pub/scm/git/git
>     * refs/heads/origin: same as branch 'master' of rsync://rsync.kernel.org/pub/scm/git/git
>     Updating from ea5a65a59916503d2a14369c46b1023384d51645 to 4ae22d96fe9248dac4f26b1fc91154ba5e879799.
>     fetch-pack.c: needs update

Your previous failed pull had left the unfinished merge around, so now when you try to pull and it tries to update, it can't.

Do a

	git checkout -f

first to reset your tree to your old HEAD, and then try again. It should work then.

(Or do "git reset --hard", which should end up doing the same thing)

		Linus