Merge pull request capistrano#34 from jgr/master

Change to the diff method of git.rb to not modify its arguments. (Allows post-deploy hooks to see the accurate diff)
cgriego · May 19, 2011 · 2a8aded · 2a8aded
2 parents ee426f7 + 9414918
commit 2a8aded
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/capistrano/recipes/deploy/scm/git.rb b/lib/capistrano/recipes/deploy/scm/git.rb
@@ -199,8 +199,8 @@ def sync(revision, destination)
 
         # Returns a string of diffs between two revisions
         def diff(from, to=nil)
-          from << "..#{to}" if to
-          scm :diff, from
+          return scm :diff, from unless to
+          scm :diff, "#{from}..#{to}"
         end
 
         # Returns a log of changes between the two revisions (inclusive).