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

Fix compatibility with FreeBSD tar
munkie · Apr 23, 2014 · f3c4eab · f3c4eab
2 parents 8c55997 + a0db741
commit f3c4eab
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/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)
 

diff --git a/lib/capistrano/git.rb b/lib/capistrano/git.rb
@@ -30,7 +30,7 @@ def update
  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

diff --git a/spec/lib/capistrano/git_spec.rb b/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