[chef] Re: How to push to upstream cookbook-vendor branch?

[Adam Jacob < >]

I honestly think it's important to call out that there are two, sometimes very, different workflows here. One is the consumption of a released cookbook - as an end user. The community site is geared for that workflow, and not really for the second workflow: collaboration and contribution. In particular, we don't want to be forcing peoples workflows for the software they choose to open source - we do want to provide a place for people who need them to get copies. Community is closer to CPAN, Rubygems, or EPEL than it is to GitHub, and that's by design.

We are adding source code browsing, though, and better integration for people with common workflows (like the Github workflow) for collaboration to make it easier to collaborate.

Best,

Adam

On Oct 15, 2011, at 12:21 PM, Bryan Berry wrote:

damn, i was hoping that 1) i misunderstood u on irc and 2) there was magic that I was missing :(

On Sat, Oct 15, 2011 at 9:19 PM, Noah Kantrowitz < "> > wrote:

On Oct 15, 2011, at 11:42 AM, Bryan Berry wrote:

> I am trying to figure out how to "vendor branch" technique to push my changes upstream cookbook.
>
> Here is the workflow that I have in mind
> $ knife cookbook site install <cookbook>
> $ vim cookbooks/<cookbook>  #make changes
> $ git checkout <cookbook>-vendor
> $ git checkout master path/to/modified-cookbook
> $ git commit -am 'merging select files into vendor-branch'
>
> However, when I  do  $ git checkout chef-<cookbook>-vendor && git ls-files
> git seems to be tracking everything in this branch, not just the files for the cookbook.
>
> I have read through http://wiki.opscode.com/display/chef/Working+with+Git+and+Cookbooks, but it still isn't clear to me how to push my changes to the upstream cookbook. Perhaps I am missing something completely obvious. Can someone enlighten me?
>
> The only other alternative I see is to track down the source of cookbook, fork it, create a patch from my code, apply it to my fork, send a pull request.

As I explained on IRC, that is indeed the way to do it. The management in the cookbook repo is purely as an installed artifact right now.

--Noah
-----BEGIN PGP SIGNATURE-----

iEYEARECAAYFAk6Z3LIACgkQA9fEp2eRsU/9uQCg71c3GrXSTO3X0dgzUUvrD9qF
If4AoJdpH43XifeRWWcLn0F+x4nlmpBe
=22IR
-----END PGP SIGNATURE-----