Merge pull request #1020 from robbertkl/freebsd-tar-fix

Fix compatibility with FreeBSD tar

CHANGELOG.md

@@ -6,6 +6,9 @@ Reverse Chronological Order:
 
 https://github.com/capistrano/capistrano/compare/v3.2.1...HEAD
 
+* Bug Fixes:
+  * Fixed compatibility with FreeBSD tar (@robbertkl)
+
 * Minor Changes
   * Added tests for after/before hooks features (@juanibiapina, @miry)
 

lib/capistrano/git.rb

@@ -30,7 +30,7 @@ class Capistrano::Git < Capistrano::SCM
     end
 
     def release
-      git :archive, fetch(:branch), '| tar -x -C', release_path
+      git :archive, fetch(:branch), '| tar -x -f - -C', release_path
     end
 
     def fetch_revision

spec/lib/capistrano/git_spec.rb

@@ -61,7 +61,7 @@ module Capistrano
         context.expects(:fetch).returns(:branch)
         context.expects(:release_path).returns(:path)
 
-        context.expects(:execute).with(:git, :archive, :branch, '| tar -x -C', :path)
+        context.expects(:execute).with(:git, :archive, :branch, '| tar -x -f - -C', :path)
 
         subject.release
       end