Merge branch 'diff_fix_current_vs_head' of https://github.com/francisluong/ruby-git into francisluong-diff_fix_current_vs_head

robertodecurnex · robertodecurnex · commit 45b085ae13a2 · 2015-01-05T15:08:30.000-03:00
diff --git a/lib/git/diff.rb b/lib/git/diff.rb
@@ -6,8 +6,8 @@ class Diff
     
     def initialize(base, from = nil, to = nil)
       @base = base
-      @from = from.to_s
-      @to = to.to_s
+      @from = from && from.to_s 
+      @to = to && to.to_s
 
       @path = nil
       @full_diff = nil
diff --git a/tests/units/test_diff.rb b/tests/units/test_diff.rb
@@ -14,6 +14,14 @@ def setup
   #  assert(1, d.size)
   #end
 
+  def test_diff_current_vs_head
+    #test git diff without specifying source/destination commits
+    update_file(File.join(@wdir,"example.txt"),"FRANCO")
+    d = @git.diff
+    patch = d.patch
+    assert(patch.match(/\+FRANCO/))
+  end
+
   def test_diff_tags
     d = @git.diff('gitsearch1', 'v2.5')
     assert_equal(3, d.size)
