Error in git pull

Error in git pull

[Larry Finger]

John,

I just pulled your latest changes from the wireless-2.6 repository. When I did so, I got the 
following git error:

finger@larrylap:~/wireless-2.6> git pull
Unpacking 22599 objects
  100% (22599/22599) done
error: no such remote ref refs/heads/zd1211rw
* refs/heads/origin: does not fast forward to branch 'master' of 
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6;
   not updating.

Is there any way for me to recover without pulling the entire tree again?

Thanks,

Larry

Re: Error in git pull

[Andreas Schwab]

Larry Finger <Larry.Finger@lwfinger.net> writes:

> I just pulled your latest changes from the wireless-2.6 repository. When I
> did so, I got the following git error:
>
> finger@larrylap:~/wireless-2.6> git pull
> Unpacking 22599 objects
>  100% (22599/22599) done
> error: no such remote ref refs/heads/zd1211rw
> * refs/heads/origin: does not fast forward to branch 'master' of
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6;
>   not updating.
>
> Is there any way for me to recover without pulling the entire tree again?

Use git reset --hard with the id of the head of the remote branch.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."