Re: [Cbe-oss-dev] [PATCH 0/15] spidernet driver bug fixes
On Wed, 2007-06-13 at 11:14 -0500, Linas Vepstas wrote: Some googling seems to show that git pull has a bug/feature of ignoring the branch that one is working in, and pulling master no matter what. I have no clue why; this seems broken to me. Branches are generally a PITA -- it's probably best just to avoid them entirely. It's not as if it's hard to create separate trees, and even share objects between the trees. -- dwmw2 - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [Cbe-oss-dev] [PATCH 0/15] spidernet driver bug fixes
David Woodhouse wrote: On Wed, 2007-06-13 at 11:14 -0500, Linas Vepstas wrote: Some googling seems to show that git pull has a bug/feature of ignoring the branch that one is working in, and pulling master no matter what. I have no clue why; this seems broken to me. Branches are generally a PITA -- it's probably best just to avoid them entirely. It's not as if it's hard to create separate trees, and even share objects between the trees. It makes diffing between lines of development more difficult, takes up more overall space, less cache friendly, ... Jeff - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [Cbe-oss-dev] [PATCH 0/15] spidernet driver bug fixes
On Thu, 2007-06-14 at 19:01 -0400, Jeff Garzik wrote: It makes diffing between lines of development more difficult, takes up more overall space, less cache friendly, ... All of which is much less true if you're sharing object directories or even using alternates. -- dwmw2 - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [Cbe-oss-dev] [PATCH 0/15] spidernet driver bug fixes
David Woodhouse wrote: On Thu, 2007-06-14 at 19:01 -0400, Jeff Garzik wrote: It makes diffing between lines of development more difficult, takes up more overall space, less cache friendly, ... All of which is much less true if you're sharing object directories or even using alternates. Think about the actual kernel tree source code, not just the metadata... Jeff - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [Cbe-oss-dev] [PATCH 0/15] spidernet driver bug fixes
On Thu, 2007-06-14 at 19:04 -0400, Jeff Garzik wrote: Think about the actual kernel tree source code, not just the metadata... Disk is cheap. Waiting for the whole damn thing to rebuild after switching branches and back again is less so. Besides, checking it out is optional. -- dwmw2 - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [Cbe-oss-dev] [PATCH 0/15] spidernet driver bug fixes
On Fri, 2007-06-15 at 00:07 +0100, David Woodhouse wrote: On Thu, 2007-06-14 at 19:04 -0400, Jeff Garzik wrote: Think about the actual kernel tree source code, not just the metadata... Disk is cheap. Waiting for the whole damn thing to rebuild after switching branches and back again is less so. ccache! cheers -- Michael Ellerman OzLabs, IBM Australia Development Lab wwweb: http://michael.ellerman.id.au phone: +61 2 6212 1183 (tie line 70 21183) We do not inherit the earth from our ancestors, we borrow it from our children. - S.M.A.R.T Person signature.asc Description: This is a digitally signed message part
Re: [Cbe-oss-dev] [PATCH 0/15] spidernet driver bug fixes
I wish there was a git option to just make my shit look like the remote, dammit! The above is the easiest way I know how to do that. git-fetch -f remote:local ? Segher - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [Cbe-oss-dev] [PATCH 0/15] spidernet driver bug fixes
Segher Boessenkool wrote: I wish there was a git option to just make my shit look like the remote, dammit! The above is the easiest way I know how to do that. git-fetch -f remote:local ? If that works... great :) Much better than what I described. Jeff - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [Cbe-oss-dev] [PATCH 0/15] spidernet driver bug fixes
On Wednesday 13 June 2007, Jeff Garzik wrote: Segher Boessenkool wrote: I wish there was a git option to just make my shit look like the remote, dammit! The above is the easiest way I know how to do that. git-fetch -f remote:local ? If that works... great :) Much better than what I described. It works as long as you are not on branch 'local', but in that case you can do 'git-fetch -f remote:local2' or something. Arnd - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [Cbe-oss-dev] [PATCH 0/15] spidernet driver bug fixes
On Wed, 2007-06-13 at 21:01 +0200, Segher Boessenkool wrote: I wish there was a git option to just make my shit look like the remote, dammit! The above is the easiest way I know how to do that. git-fetch -f remote:local ? There's always git reset --hard sha1 cheers -- Michael Ellerman OzLabs, IBM Australia Development Lab wwweb: http://michael.ellerman.id.au phone: +61 2 6212 1183 (tie line 70 21183) We do not inherit the earth from our ancestors, we borrow it from our children. - S.M.A.R.T Person signature.asc Description: This is a digitally signed message part
