Disqus - Friends of develop7

Re: Using Git to Manage and Deploy your Rails Apps | Join The Conversation

chacon — Wed, 07 Nov 2007 17:09:20 -0000

Hmm - sorry Chris, I'd like to help, but I'm stumped. It's an h.264 quicktime file, encoded by iMovie. I can't imagine why a Mac wouldn't play it. Does the flv work for you? If you'd like it in another format, I can certainly re-encode it.

Re: Using Git to Manage and Deploy your Rails Apps | Join The Conversation

chacon — Sat, 10 Nov 2007 10:01:25 -0000

OK, I put up a new movie using ffmpeg's mpeg4 - hopefully that will work for you. It's here:

http://s3.amazonaws.com/cha...

Let me know if that is better, and I will link it as well.

Re: Using Git to Manage and Deploy your Rails Apps | Join The Conversation

chacon — Sat, 10 Nov 2007 10:07:27 -0000

the 'ssh_options' make it so NetSSH doesn't complain about mismatched keys in your host file, which is a pain mostly because I was using weird vmware servers to run the other servers - normally I don't need that - it just makes NetSSH less strict about who it will connect to.

the set :user and set :runner commands determine who Capistrano tries to log in as and run the 'spin' script / mongrels, respectively. if you set :user to 'bob', it will try to ssh in as bob@server.com rather than who youre currently logged in as. if you set :runner to 'mongrel', it will try to start/restart the servers as the user 'mongrel' rather than 'bob'.

hope that helps. if you have specific error messages, let me know.

Re: Pro Git - Welcome to the Pro Git website

chacon — Tue, 28 Jul 2009 10:05:30 -0000

I'm sorry, I can't find this reference. Can you give me more context?

Re: Pro Git - Welcome to the Pro Git website

chacon — Tue, 28 Jul 2009 10:06:07 -0000

thanks!

Re: Pro Git - Welcome to the Pro Git website

chacon — Tue, 28 Jul 2009 10:07:28 -0000

thanks!

Re: Pro Git - Welcome to the Pro Git website

chacon — Tue, 28 Jul 2009 10:23:32 -0000

Nevermind - davedash pushed a fix for this typo to his fork on GitHub and I just pulled it in.

Re: Pro Git - Welcome to the Pro Git website

chacon — Tue, 28 Jul 2009 10:24:41 -0000

There will be an official APress ebook version for sale, though someone made a sort of "print to file" version that you can get here: http://redraftable.com/temp...

Re: Pro Git - The Gory Details

chacon — Tue, 28 Jul 2009 17:29:37 -0000

Yes, you can either email me at [ schacon at gmail ] or you can fork the source on github and send me a pull request. Or leave a comment here with details. Thanks!

Re: Pro Git - Welcome to the Pro Git website

chacon — Fri, 11 Sep 2009 10:42:33 -0000

There is certainly no rule, but as the book is "Pro Git", in most professional situations it is probably a good idea to have something that the team uses to do releases off of or find a golden copy. If there are several, someone has to integrate from each and push to the others or changes won't get propagated. Then that person is responsible for merge conflicts between the teams, which they likely don't want to do. In most organizations (commercial or open source projects), one of the remote repositories is likely to be thought of as 'blessed' by at least most of the team. If there is another, I think that would be more likely considered a 'fork' in the traditional, more negative sense of the phrase.

Re: The Real Difference Between Mercurial and Git / Steve Losh

chacon — Fri, 22 Jan 2010 05:14:31 -0000

I agree with much of this, but just to defend my site super quickly, I still feel that Git's branching model is still an advantage over Hg and that it is 'cheaper'. As of the last time I checked, Hg still takes longer in absolute time to create a new branch and Hg lightweight branches are very difficult to get rid of later, which I would argue makes them more heavyweight. It's true that it's more difficult to create anonymous branches in Git, but I would rather have the context of at least some description, so I don't really see that as an advantage, and definitely doesn't make it 'cheaper'. Hg users have created the 'bookmarks' extension to try to emulate Gits branching model, but there are still a few issues with it, specifically in the area of sharing and collaborating via those branches. I try to keep that site basically up to date, but I don't think that your argument with respect to Hg/Git here is very accurate. If you still disagree, that's cool - but I wanted to point out that the discrepancy is not due to ignorance or quantifiable inaccuracy on my part, but rather subjective disagreement between you and I.

Re: Pro Git - Undoing Merges

chacon — Thu, 04 Mar 2010 14:32:17 -0000

I'm an idiot - I knew that. I've updated the post.

Re: Pro Git - Undoing Merges

chacon — Thu, 04 Mar 2010 14:32:58 -0000

thanks - i'll try to fix that. it might take FB a bit to update itself.

Re: Pro Git - Smart HTTP Transport

chacon — Fri, 05 Mar 2010 13:21:34 -0000

i assume you're asking specifically about GitHub here, not smart-http in general. the answer in that case is 'yes', we are planning on supporting all repositories over https for authenticated access.

Re: Pro Git - Smart HTTP Transport

chacon — Fri, 05 Mar 2010 13:43:27 -0000

that's entirely up to codaset if they're going to implement and support that. it's not automatic, the servers need to be setup, obviously.

Re: Pro Git - Undoing Merges

chacon — Wed, 10 Mar 2010 19:08:44 -0000

That's interesting - I honestly didn't know that. I likewise have no idea if upload-pack and receive-pack actually work properly on Windows, which the Grack wrapper directly calls. I would assume it would - let me know if you get it working, I'm pretty curious.

Re: Pro Git - Undoing Merges

chacon — Wed, 10 Mar 2010 19:09:53 -0000

I'm going to try to do replace refs in an upcoming post - I'll mention that.

Re: Pro Git - Undoing Merges

chacon — Wed, 10 Mar 2010 19:10:47 -0000

Reading this again - was this meant for the other post (on Grack?)

Re: Pro Git - Replace Kicker

chacon — Wed, 17 Mar 2010 14:04:30 -0000

Thanks! That's a good point - I don't always do that on purpose. I think for-each-ref and it's use in scripting Git would be a good candidate for another article - I'll add it to the list.

Re: Pro Git - Smart HTTP Transport

chacon — Fri, 19 Mar 2010 12:21:48 -0000

Yes, the client will fall back to trying the old method. When you fetch, does it do the ref walking (printing out all the shas) or does it look like a normal fetch/clone? Because it could be your client is not new enough (>=1.6.6) or your server is misconfigured. Either would cause the client to fall back on the older push method which was DAV based. You should be able to tell via the Apache logging if the request is getting to the backend or not.

Re: Pro Git - Smart HTTP Transport

chacon — Thu, 22 Apr 2010 11:19:20 -0000

Bit of an update: GitHub now supports this protocol, if you're using a newer Git: http://github.com/blog/642-...

Re: Separating Content From Style

chacon — Fri, 23 Apr 2010 18:01:34 -0000

no problem. thanks for using it.

Re: Pro Git - Pro Git on your iPad

chacon — Thu, 03 Feb 2011 09:36:22 -0000

thanks for the feedback, though I thought I made it clear that client side hooks are not enforceable unless everyone is working on a shared server. there are good security reasons for this - you can't clone something from github or something and have it setup a script as a hook that could be malicious. most places will have the hooks in a subdirectory of the repo and a script that will install them locally and set them up, then enforce stuff on the server side. this is really the only safe way to handle this.

Re: Pro Git - Reset Demystified

chacon — Fri, 15 Jul 2011 14:16:31 -0000

git show [commit]:file.txt > file.txt

Re: Pro Git - Reset Demystified

chacon — Fri, 15 Jul 2011 14:18:06 -0000

I did so in the Workflow section. Search for those strings in the article to find where I explain exactly that.