Merge branch 'fix-git-package-ubuntu-10' into 1.0.x

81 files changed, 405 insertions, 81 deletions

diff --git a/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_http.rb b/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_http.rb
index 18c7534..421c5f0 100644
--- a/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_http.rb
+++ b/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_http.rb
@@ -12,7 +12,11 @@ hosts.each do |host|
   gem = '/opt/puppet/bin/gem' if host.is_pe? || 'gem'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_https.rb b/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_https.rb
index ac1359e..753e50c 100644
--- a/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_https.rb
+++ b/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_https.rb
@@ -11,7 +11,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/basic_auth/negative/basic_auth_checkout_git.rb b/spec/acceptance/beaker/git/basic_auth/negative/basic_auth_checkout_git.rb
index 628c627..3b47c48 100644
--- a/spec/acceptance/beaker/git/basic_auth/negative/basic_auth_checkout_git.rb
+++ b/spec/acceptance/beaker/git/basic_auth/negative/basic_auth_checkout_git.rb
@@ -9,7 +9,11 @@ http_server_script = 'basic_auth_http_daemon.rb'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_file.rb b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_file.rb
index 1fbdd1a..3d2131c 100644
--- a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_file.rb
+++ b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_file.rb
@@ -7,7 +7,11 @@ branch = 'a_branch'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_file_path.rb b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_file_path.rb
index efbedc7..49b034e 100644
--- a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_file_path.rb
+++ b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_file_path.rb
@@ -7,7 +7,11 @@ branch = 'a_branch'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_git.rb b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_git.rb
index 837e170..9557de8 100644
--- a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_git.rb
+++ b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_git.rb
@@ -7,7 +7,11 @@ branch = 'a_branch'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb
index a8d622d..fec60e2 100644
--- a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb
+++ b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb
@@ -8,7 +8,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_https.rb b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_https.rb
index f6baf19..3474c73 100644
--- a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_https.rb
+++ b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_https.rb
@@ -8,7 +8,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_scp.rb b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_scp.rb
index e55f805..493b3f4 100644
--- a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_scp.rb
+++ b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_scp.rb
@@ -7,7 +7,11 @@ branch = 'a_branch'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_ssh.rb b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_ssh.rb
index 6063bb9..5195ab8 100644
--- a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_ssh.rb
+++ b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_ssh.rb
@@ -7,7 +7,11 @@ branch = 'a_branch'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/branch_checkout/negative/branch_checkout_not_exists.rb b/spec/acceptance/beaker/git/branch_checkout/negative/branch_checkout_not_exists.rb
index e44ea7e..7b9e64d 100644
--- a/spec/acceptance/beaker/git/branch_checkout/negative/branch_checkout_not_exists.rb
+++ b/spec/acceptance/beaker/git/branch_checkout/negative/branch_checkout_not_exists.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_branch_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/clone/clone_file.rb b/spec/acceptance/beaker/git/clone/clone_file.rb
index a9ca366..45413a9 100644
--- a/spec/acceptance/beaker/git/clone/clone_file.rb
+++ b/spec/acceptance/beaker/git/clone/clone_file.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_clone'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/clone/clone_file_path.rb b/spec/acceptance/beaker/git/clone/clone_file_path.rb
index 616030c..a57e05a 100644
--- a/spec/acceptance/beaker/git/clone/clone_file_path.rb
+++ b/spec/acceptance/beaker/git/clone/clone_file_path.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_clone'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/clone/clone_git.rb b/spec/acceptance/beaker/git/clone/clone_git.rb
index 7656860..3bceb5d 100644
--- a/spec/acceptance/beaker/git/clone/clone_git.rb
+++ b/spec/acceptance/beaker/git/clone/clone_git.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_clone'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/clone/clone_http.rb b/spec/acceptance/beaker/git/clone/clone_http.rb
index 5ba7915..f545dab 100644
--- a/spec/acceptance/beaker/git/clone/clone_http.rb
+++ b/spec/acceptance/beaker/git/clone/clone_http.rb
@@ -7,7 +7,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/clone/clone_https.rb b/spec/acceptance/beaker/git/clone/clone_https.rb
index 0d3d1f6..8758435 100644
--- a/spec/acceptance/beaker/git/clone/clone_https.rb
+++ b/spec/acceptance/beaker/git/clone/clone_https.rb
@@ -7,7 +7,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/clone/clone_over_different_exiting_repo_with_force.rb b/spec/acceptance/beaker/git/clone/clone_over_different_exiting_repo_with_force.rb
index a88709f..3bc3e30 100644
--- a/spec/acceptance/beaker/git/clone/clone_over_different_exiting_repo_with_force.rb
+++ b/spec/acceptance/beaker/git/clone/clone_over_different_exiting_repo_with_force.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_already_exists'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/clone/clone_repo_with_excludes_in_repo.rb b/spec/acceptance/beaker/git/clone/clone_repo_with_excludes_in_repo.rb
index 89844c3..dec275f 100644
--- a/spec/acceptance/beaker/git/clone/clone_repo_with_excludes_in_repo.rb
+++ b/spec/acceptance/beaker/git/clone/clone_repo_with_excludes_in_repo.rb
@@ -8,7 +8,11 @@ exclude2 ='file2.txt'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/clone/clone_repo_with_excludes_not_in_repo.rb b/spec/acceptance/beaker/git/clone/clone_repo_with_excludes_not_in_repo.rb
index 10c0e8e..ba37930 100644
--- a/spec/acceptance/beaker/git/clone/clone_repo_with_excludes_not_in_repo.rb
+++ b/spec/acceptance/beaker/git/clone/clone_repo_with_excludes_not_in_repo.rb
@@ -8,7 +8,11 @@ exclude2 ='ho398b'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/clone/clone_scp.rb b/spec/acceptance/beaker/git/clone/clone_scp.rb
index 709079d..59370eb 100644
--- a/spec/acceptance/beaker/git/clone/clone_scp.rb
+++ b/spec/acceptance/beaker/git/clone/clone_scp.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_clone'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/clone/clone_ssh.rb b/spec/acceptance/beaker/git/clone/clone_ssh.rb
index 7f4a9a4..5bc06ec 100644
--- a/spec/acceptance/beaker/git/clone/clone_ssh.rb
+++ b/spec/acceptance/beaker/git/clone/clone_ssh.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_clone'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/clone/negative/clone_over_different_exiting_repo.rb b/spec/acceptance/beaker/git/clone/negative/clone_over_different_exiting_repo.rb
index 8adb1af..6826673 100644
--- a/spec/acceptance/beaker/git/clone/negative/clone_over_different_exiting_repo.rb
+++ b/spec/acceptance/beaker/git/clone/negative/clone_over_different_exiting_repo.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_already_exists'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/clone/negative/clone_repo_with_exec_excludes.rb b/spec/acceptance/beaker/git/clone/negative/clone_repo_with_exec_excludes.rb
index 2264015..9805355 100644
--- a/spec/acceptance/beaker/git/clone/negative/clone_repo_with_exec_excludes.rb
+++ b/spec/acceptance/beaker/git/clone/negative/clone_repo_with_exec_excludes.rb
@@ -8,7 +8,11 @@ exclude1 = "`exec \"rm -rf /tmp\"`"
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/compression_0_checkout.rb b/spec/acceptance/beaker/git/compression/compression_0_checkout.rb
index f17d497..7ac4c4a 100644
--- a/spec/acceptance/beaker/git/compression/compression_0_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/compression_0_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/compression_1_checkout.rb b/spec/acceptance/beaker/git/compression/compression_1_checkout.rb
index ee910fd..8b7455d 100644
--- a/spec/acceptance/beaker/git/compression/compression_1_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/compression_1_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/compression_2_checkout.rb b/spec/acceptance/beaker/git/compression/compression_2_checkout.rb
index aeec31a..81d32c3 100644
--- a/spec/acceptance/beaker/git/compression/compression_2_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/compression_2_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/compression_3_checkout.rb b/spec/acceptance/beaker/git/compression/compression_3_checkout.rb
index fe1ee0a..12b60a3 100644
--- a/spec/acceptance/beaker/git/compression/compression_3_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/compression_3_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/compression_4_checkout.rb b/spec/acceptance/beaker/git/compression/compression_4_checkout.rb
index 071cc5e..66d2d5e 100644
--- a/spec/acceptance/beaker/git/compression/compression_4_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/compression_4_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/compression_5_checkout.rb b/spec/acceptance/beaker/git/compression/compression_5_checkout.rb
index 1ea0737..b60a9f7 100644
--- a/spec/acceptance/beaker/git/compression/compression_5_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/compression_5_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/compression_6_checkout.rb b/spec/acceptance/beaker/git/compression/compression_6_checkout.rb
index a8376d7..2f6b075 100644
--- a/spec/acceptance/beaker/git/compression/compression_6_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/compression_6_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/negative/compression_7_checkout.rb b/spec/acceptance/beaker/git/compression/negative/compression_7_checkout.rb
index c5f49e6..e74cca9 100644
--- a/spec/acceptance/beaker/git/compression/negative/compression_7_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/negative/compression_7_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/negative/compression_alpha_checkout.rb b/spec/acceptance/beaker/git/compression/negative/compression_alpha_checkout.rb
index 74fd112..59aaf21 100644
--- a/spec/acceptance/beaker/git/compression/negative/compression_alpha_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/negative/compression_alpha_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/negative/compression_eval_checkout.rb b/spec/acceptance/beaker/git/compression/negative/compression_eval_checkout.rb
index ba56621..b989e58 100644
--- a/spec/acceptance/beaker/git/compression/negative/compression_eval_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/negative/compression_eval_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/negative/compression_exec_checkout.rb b/spec/acceptance/beaker/git/compression/negative/compression_exec_checkout.rb
index abab7f1..e1373af 100644
--- a/spec/acceptance/beaker/git/compression/negative/compression_exec_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/negative/compression_exec_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/compression/negative/compression_negative_checkout.rb b/spec/acceptance/beaker/git/compression/negative/compression_negative_checkout.rb
index 2485424..1253db1 100644
--- a/spec/acceptance/beaker/git/compression/negative/compression_negative_checkout.rb
+++ b/spec/acceptance/beaker/git/compression/negative/compression_negative_checkout.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/create/create_bare_repo_that_already_exists.rb b/spec/acceptance/beaker/git/create/create_bare_repo_that_already_exists.rb
index b72963b..ccb8a70 100644
--- a/spec/acceptance/beaker/git/create/create_bare_repo_that_already_exists.rb
+++ b/spec/acceptance/beaker/git/create/create_bare_repo_that_already_exists.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_bare_repo_already_exists.git'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create bare repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     on(host, "mkdir #{tmpdir}/#{repo_name}")
     on(host, "cd #{tmpdir}/#{repo_name} && git --bare init")
   end
diff --git a/spec/acceptance/beaker/git/create/create_repo_that_already_exists.rb b/spec/acceptance/beaker/git/create/create_repo_that_already_exists.rb
index f31dda0..8fb8543 100644
--- a/spec/acceptance/beaker/git/create/create_repo_that_already_exists.rb
+++ b/spec/acceptance/beaker/git/create/create_repo_that_already_exists.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_already_exists'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/create/negative/create_bare_repo_specifying_revision.rb b/spec/acceptance/beaker/git/create/negative/create_bare_repo_specifying_revision.rb
index ece10a5..5b789df 100644
--- a/spec/acceptance/beaker/git/create/negative/create_bare_repo_specifying_revision.rb
+++ b/spec/acceptance/beaker/git/create/negative/create_bare_repo_specifying_revision.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_bare.git'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
   end
 
   teardown do
diff --git a/spec/acceptance/beaker/git/group_checkout/group_checkout_file.rb b/spec/acceptance/beaker/git/group_checkout/group_checkout_file.rb
index be5ae92..beea7b8 100644
--- a/spec/acceptance/beaker/git/group_checkout/group_checkout_file.rb
+++ b/spec/acceptance/beaker/git/group_checkout/group_checkout_file.rb
@@ -7,7 +7,11 @@ group = 'mygroup'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/group_checkout/group_checkout_file_path.rb b/spec/acceptance/beaker/git/group_checkout/group_checkout_file_path.rb
index c204792..319a8e7 100644
--- a/spec/acceptance/beaker/git/group_checkout/group_checkout_file_path.rb
+++ b/spec/acceptance/beaker/git/group_checkout/group_checkout_file_path.rb
@@ -7,7 +7,11 @@ group = 'mygroup'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/group_checkout/group_checkout_git.rb b/spec/acceptance/beaker/git/group_checkout/group_checkout_git.rb
index 04238ea..e5b9cf2 100644
--- a/spec/acceptance/beaker/git/group_checkout/group_checkout_git.rb
+++ b/spec/acceptance/beaker/git/group_checkout/group_checkout_git.rb
@@ -7,7 +7,11 @@ group = 'mygroup'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb b/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb
index 43c3f2e..bf86f2e 100644
--- a/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb
+++ b/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb
@@ -8,7 +8,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb b/spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb
index 6825df3..c4c645f 100644
--- a/spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb
+++ b/spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb
@@ -8,7 +8,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/group_checkout/group_checkout_scp.rb b/spec/acceptance/beaker/git/group_checkout/group_checkout_scp.rb
index 0bcf143..c65acc4 100644
--- a/spec/acceptance/beaker/git/group_checkout/group_checkout_scp.rb
+++ b/spec/acceptance/beaker/git/group_checkout/group_checkout_scp.rb
@@ -7,7 +7,11 @@ group = 'mygroup'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/group_checkout/group_checkout_ssh.rb b/spec/acceptance/beaker/git/group_checkout/group_checkout_ssh.rb
index 87bad69..cccad19 100644
--- a/spec/acceptance/beaker/git/group_checkout/group_checkout_ssh.rb
+++ b/spec/acceptance/beaker/git/group_checkout/group_checkout_ssh.rb
@@ -7,7 +7,11 @@ group = 'mygroup'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/group_checkout/negative/group_checkout_file_non_existent_group.rb b/spec/acceptance/beaker/git/group_checkout/negative/group_checkout_file_non_existent_group.rb
index 5388f7f..081642d 100644
--- a/spec/acceptance/beaker/git/group_checkout/negative/group_checkout_file_non_existent_group.rb
+++ b/spec/acceptance/beaker/git/group_checkout/negative/group_checkout_file_non_existent_group.rb
@@ -7,7 +7,11 @@ group = 'mygroup'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/revision_checkout/negative/revision_checkout_not_exists.rb b/spec/acceptance/beaker/git/revision_checkout/negative/revision_checkout_not_exists.rb
index 7f0f1b2..85f1fcc 100644
--- a/spec/acceptance/beaker/git/revision_checkout/negative/revision_checkout_not_exists.rb
+++ b/spec/acceptance/beaker/git/revision_checkout/negative/revision_checkout_not_exists.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_revision_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_file.rb b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_file.rb
index be84f0e..b17dc73 100644
--- a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_file.rb
+++ b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_file.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_revision_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_file_path.rb b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_file_path.rb
index 93db164..c80eb81 100644
--- a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_file_path.rb
+++ b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_file_path.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_revision_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_git.rb b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_git.rb
index 2994bb5..69a7fe2 100644
--- a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_git.rb
+++ b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_git.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_revision_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_http.rb b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_http.rb
index 8101794..7cac163 100644
--- a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_http.rb
+++ b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_http.rb
@@ -7,7 +7,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_https.rb b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_https.rb
index adab3a8..1c705a5 100644
--- a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_https.rb
+++ b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_https.rb
@@ -7,7 +7,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_scp.rb b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_scp.rb
index fb6a20a..b5dbd24 100644
--- a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_scp.rb
+++ b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_scp.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_revision_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_ssh.rb b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_ssh.rb
index 9325a0b..222653e 100644
--- a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_ssh.rb
+++ b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_ssh.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_revision_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_exec_depth.rb b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_exec_depth.rb
index d82e3c6..f01a488 100644
--- a/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_exec_depth.rb
+++ b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_exec_depth.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_shallow_clone'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_file_path.rb b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_file_path.rb
index 961d0fe..47fb338 100644
--- a/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_file_path.rb
+++ b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_file_path.rb
@@ -7,7 +7,11 @@ repo_name = 'testrepo_shallow_clone'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb
index 956d7de..723a0b6 100644
--- a/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb
+++ b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb
@@ -7,7 +7,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_negative_depth.rb b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_negative_depth.rb
index c80faa0..869620d 100644
--- a/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_negative_depth.rb
+++ b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_negative_depth.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_shallow_clone'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_overflow_depth.rb b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_overflow_depth.rb
index fdf4977..a40a204 100644
--- a/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_overflow_depth.rb
+++ b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_overflow_depth.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_shallow_clone'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_file.rb b/spec/acceptance/beaker/git/shallow_clone/shallow_clone_file.rb
index e68bbd4..9e2abe2 100644
--- a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_file.rb
+++ b/spec/acceptance/beaker/git/shallow_clone/shallow_clone_file.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_shallow_clone'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_git.rb b/spec/acceptance/beaker/git/shallow_clone/shallow_clone_git.rb
index 3ceb58e..49683d2 100644
--- a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_git.rb
+++ b/spec/acceptance/beaker/git/shallow_clone/shallow_clone_git.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_shallow_clone'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_https.rb b/spec/acceptance/beaker/git/shallow_clone/shallow_clone_https.rb
index c045018..2392728 100644
--- a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_https.rb
+++ b/spec/acceptance/beaker/git/shallow_clone/shallow_clone_https.rb
@@ -8,7 +8,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_scp.rb b/spec/acceptance/beaker/git/shallow_clone/shallow_clone_scp.rb
index 1201710..1d5b35a 100644
--- a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_scp.rb
+++ b/spec/acceptance/beaker/git/shallow_clone/shallow_clone_scp.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_shallow_clone'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_ssh.rb b/spec/acceptance/beaker/git/shallow_clone/shallow_clone_ssh.rb
index 76f2a46..0f00b30 100644
--- a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_ssh.rb
+++ b/spec/acceptance/beaker/git/shallow_clone/shallow_clone_ssh.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_shallow_clone'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_zero_depth.rb b/spec/acceptance/beaker/git/shallow_clone/shallow_clone_zero_depth.rb
index eb8b121..34c624f 100644
--- a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_zero_depth.rb
+++ b/spec/acceptance/beaker/git/shallow_clone/shallow_clone_zero_depth.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_shallow_clone'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/tag_checkout/negative/tag_checkout_not_exists.rb b/spec/acceptance/beaker/git/tag_checkout/negative/tag_checkout_not_exists.rb
index 04dd014..1849f02 100644
--- a/spec/acceptance/beaker/git/tag_checkout/negative/tag_checkout_not_exists.rb
+++ b/spec/acceptance/beaker/git/tag_checkout/negative/tag_checkout_not_exists.rb
@@ -6,7 +6,11 @@ repo_name = 'testrepo_tag_checkout'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_file.rb b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_file.rb
index 8929b0b..9c74485 100644
--- a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_file.rb
+++ b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_file.rb
@@ -7,7 +7,11 @@ tag = '0.0.2'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_file_path.rb b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_file_path.rb
index 33d7f41..01f319c 100644
--- a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_file_path.rb
+++ b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_file_path.rb
@@ -7,7 +7,11 @@ tag = '0.0.2'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_git.rb b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_git.rb
index 44b0324..42e689c 100644
--- a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_git.rb
+++ b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_git.rb
@@ -7,7 +7,11 @@ tag = '0.0.2'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_http.rb b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_http.rb
index bb211c1..3ea363c 100644
--- a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_http.rb
+++ b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_http.rb
@@ -8,7 +8,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_https.rb b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_https.rb
index 95a98f5..d508c43 100644
--- a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_https.rb
+++ b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_https.rb
@@ -8,7 +8,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_scp.rb b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_scp.rb
index f7af937..cb96b4e 100644
--- a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_scp.rb
+++ b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_scp.rb
@@ -7,7 +7,11 @@ tag = '0.0.2'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_ssh.rb b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_ssh.rb
index 006646a..bc416e8 100644
--- a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_ssh.rb
+++ b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_ssh.rb
@@ -7,7 +7,11 @@ tag = '0.0.2'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/user_checkout/negative/user_checkout_file_non_existent_user.rb b/spec/acceptance/beaker/git/user_checkout/negative/user_checkout_file_non_existent_user.rb
index 19af709..245e175 100644
--- a/spec/acceptance/beaker/git/user_checkout/negative/user_checkout_file_non_existent_user.rb
+++ b/spec/acceptance/beaker/git/user_checkout/negative/user_checkout_file_non_existent_user.rb
@@ -7,7 +7,11 @@ user = 'myuser'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/user_checkout/user_checkout_file.rb b/spec/acceptance/beaker/git/user_checkout/user_checkout_file.rb
index 9133661..ccd9ad4 100644
--- a/spec/acceptance/beaker/git/user_checkout/user_checkout_file.rb
+++ b/spec/acceptance/beaker/git/user_checkout/user_checkout_file.rb
@@ -7,7 +7,11 @@ user = 'myuser'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/user_checkout/user_checkout_file_path.rb b/spec/acceptance/beaker/git/user_checkout/user_checkout_file_path.rb
index 1104fdd..602769d 100644
--- a/spec/acceptance/beaker/git/user_checkout/user_checkout_file_path.rb
+++ b/spec/acceptance/beaker/git/user_checkout/user_checkout_file_path.rb
@@ -7,7 +7,11 @@ user = 'myuser'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb b/spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb
index 4110d05..af2ffb7 100644
--- a/spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb
+++ b/spec/acceptance/beaker/git/user_checkout/user_checkout_git.rb
@@ -7,7 +7,11 @@ user = 'myuser'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb b/spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb
index 03ea27b..e8713e5 100644
--- a/spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb
+++ b/spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb
@@ -8,7 +8,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb b/spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb
index 7348755..4e633d7 100644
--- a/spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb
+++ b/spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb
@@ -8,7 +8,11 @@ hosts.each do |host|
   ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/user_checkout/user_checkout_scp.rb b/spec/acceptance/beaker/git/user_checkout/user_checkout_scp.rb
index dccf9f8..98efb46 100644
--- a/spec/acceptance/beaker/git/user_checkout/user_checkout_scp.rb
+++ b/spec/acceptance/beaker/git/user_checkout/user_checkout_scp.rb
@@ -7,7 +7,11 @@ user = 'myuser'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")
diff --git a/spec/acceptance/beaker/git/user_checkout/user_checkout_ssh.rb b/spec/acceptance/beaker/git/user_checkout/user_checkout_ssh.rb
index 5ee01b1..cfd521e 100644
--- a/spec/acceptance/beaker/git/user_checkout/user_checkout_ssh.rb
+++ b/spec/acceptance/beaker/git/user_checkout/user_checkout_ssh.rb
@@ -7,7 +7,11 @@ user = 'myuser'
 hosts.each do |host|
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
-    install_package(host, 'git')
+    git_pkg = 'git'
+    if host['platform'] =~ /ubuntu-10/
+      git_pkg = 'git-core'
+    end
+    install_package(host, git_pkg)
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
     scp_to(host, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir)
     on(host, "cd #{tmpdir} && ./create_git_repo.sh")