@@ -117,7 +117,7 @@ class Chef end # since we're in a local branch already, just reset to specified revision rather than merge - sync_command << "#{git} fetch #{@new_resource.remote} && #{git} reset --hard #{revision}" + sync_command << "#{git} fetch #{@new_resource.remote} --tags && #{git} reset --hard #{revision}" Chef::Log.info "Fetching updates from #{new_resource.remote} and resetting to revison #{revision}" run_command(run_options(:command => sync_command.join(" && "), :cwd => @new_resource.destination)) end chef/lib/chef/provider/git.rb @@ -181,7 +181,7 @@ describe Chef::Provider::Git do end it "runs a sync command with default options" do - expected_cmd = "git fetch origin && git reset --hard d35af14d41ae22b19da05d7d03a0bafc321b244c" + expected_cmd = "git fetch origin --tags && git reset --hard d35af14d41ae22b19da05d7d03a0bafc321b244c" @provider.should_receive(:run_command).with(:command=>expected_cmd, :cwd=> "/my/deploy/dir") @provider.sync end @@ -190,7 +190,7 @@ describe Chef::Provider::Git do @resource.remote "opscode" expected_cmd = "git config remote.opscode.url git://github.com/opscode/chef.git && " + "git config remote.opscode.fetch +refs/heads/*:refs/remotes/opscode/* && " + - "git fetch opscode && git reset --hard d35af14d41ae22b19da05d7d03a0bafc321b244c" + "git fetch opscode --tags && git reset --hard d35af14d41ae22b19da05d7d03a0bafc321b244c" @provider.should_receive(:run_command).with(:command => expected_cmd, :cwd => "/my/deploy/dir") @provider.sync end chef/spec/unit/provider/git_spec.rb f80b5b578a6000b1da64e2c558f9bc4e5dc33872 Adam Jacob adam@opscode.com http://github.com/opscode/chef/commit/2c47c70bf690fb39d5db1336b6735d24211a030a 2c47c70bf690fb39d5db1336b6735d24211a030a 2009-11-04T21:07:16-08:00 2009-11-04T21:07:16-08:00 Fixes CHEF-688 We need to be fetching tags, so that you can deploy new tag revisions. e9224c87b047a2daf0e72ca61ae5d2ef0750f577 Adam Jacob adam@opscode.com