git pull for update of netdev fails.
- From
- Stephen Hemminger <shemminger@osdl.org>
- Date
- Sep 20, 2006, 15:03 UTC
- Message-ID
- <20060920080308.673a1e93@localhost.localdomain>
Jeff, you use branches on the netdev tree, but GIT doesn't seem to like to sync these up properly. My normal method is to keep a clone'd version of the netdev tree and use pull to resync it. I don't do any changes to that tree.
This doesn't work with all the branches for some reason. Is this a git bug?
$ git pull Generating pack... Done counting 666 objects. Result has 400 objects. Deltifying 400 objects. 100% (400/400) done Unpacking 400 objects Total 400, written 400 (delta 324), reused 0 (delta 0) 100% (400/400) done * refs/heads/origin: fast forward to branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 from f04b92e97d21b1921c91ec1d6d5e8bbf8606b77a to e478bec0ba0a83a48a0f6982934b6de079e7e6b3 * refs/heads/e100-sbit: does not fast forward to branch 'e100-sbit' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6; not updating.
A temporary workaround is to prune the offending branches locally first, but that seems like a hack.