On Jan 25, 2011, at 12:00 AM, Fredrik Eriksson wrote: > Ross W skrev 2011-01-24 19:45: > >> For the rake task you have to configure the sendemail stuff in git. >> Maybe this will help as an example config >> >> http://www.kernel.org/pub/software/scm/git/docs/git-send-email.html#_use_gmail_as_the_smtp_server >> >> >> As a thing for the archives: >> >> For a Freebsd base ruby install, you need also install the following >> rubygems: >> >> rake (available in ports as: rubygem-rake) >> rspec (old v1 in ports which doesn't work, must use "gem install rspec" >> to get v2) >> >> Doing a "gem list --local" gives me the following: >> >> -= >> *** LOCAL GEMS *** >> >> diff-lcs (1.1.2) >> rake (0.8.7) >> rspec (2.4.0) >> rspec-core (2.4.0) >> rspec-expectations (2.4.0) >> rspec-mocks (2.4.0) >> ruby-augeas (0.3.0) >> sources (0.0.2) >> -= >> >> >> R. > > So, most of the problem was apparently me accidentaly forking the wrong > repository... Anyway that is corrected, but I still run into this: > > $ rake mail_patches > (in ~/dev/puppet) > git format-patch -C -M -s -n --subject-prefix='PATCH/puppet' 2.6.x..HEAD > fatal: ambiguous argument '2.6.x..HEAD': unknown revision or path not in the > working tree. > Use '--' to separate paths from revisions > rake aborted! > > My guess is that I still fail with git (sorry, my first time using git). In > github I can see all branches, but in the local cloned repository I only have > two branches: master and ticket/2.6.x/5855 that I created. As I guess that > '2.6.x..HEAD' in this case means changes from branch 2.6.x to HEAD it is > probably relevant. If anyone could enlighten me about this it would be > appreciated :)
You need to create a local tracking branch of 2.6.x, something like: $ git checkout 2.6.x origin/2.6.x You might need to reverse the arguments; I seem to always confuse the order in the various commands. -- I think that's how Chicago got started. A bunch of people in New York said, 'Gee, I'm enjoying the crime and the poverty, but it just isn't cold enough. Let's go west.' --Richard Jeni --------------------------------------------------------------------- Luke Kanies -|- http://puppetlabs.com -|- +1(615)594-8199 -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
