tests/fixtures/diff_2

   1 diff --git a/lib/grit/commit.rb b/lib/grit/commit.rb
   2 index a093bb1db8e884cccf396b297259181d1caebed4..80fd3d527f269ecbd570b65b8e21fd85baedb6e9 100644
   3 --- a/lib/grit/commit.rb
   4 +++ b/lib/grit/commit.rb
   5 @@ -156,12 +156,8 @@ module Grit
   6
   7      def diffs
   8        if parents.empty?
   9 -        diff = @repo.git.show({:full_index => true, :pretty => 'raw'}, @id)
  10 -        if diff =~ /diff --git a/
  11 -          diff = diff.sub(/.+?(diff --git a)/m, '\1')
  12 -        else
  13 -          diff = ''
  14 -        end
  15 +        diff = @repo.git.show({:full_index => true, :pretty => 'raw'}, @id)
  16 +        diff = diff.sub(/.+?(diff --git a)/m, '\1')
  17          Diff.list_from_string(@repo, diff)
  18        else
  19          self.class.diff(@repo, parents.first.id, @id)
  20 diff --git a/test/fixtures/show_empty_commit b/test/fixtures/show_empty_commit
  21 deleted file mode 100644
  22 index ea25e32a409fdf74c1b9268820108d1c16dcc553..0000000000000000000000000000000000000000
  23 --- a/test/fixtures/show_empty_commit
  24 +++ /dev/null
  25 @@ -1,6 +0,0 @@
  26 -commit 1e3824339762bd48316fe87bfafc853732d43264
  27 -tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
  28 -author Tom Preston-Werner <tom@mojombo.com> 1157392833 +0000
  29 -committer Tom Preston-Werner <tom@mojombo.com> 1157392833 +0000
  30 -
  31 -    initial directory structure
  32 diff --git a/test/test_commit.rb b/test/test_commit.rb
  33 index fdeb9000089b052f0b31a845e0173e9b089e06a0..bdbc450e08084d7d611e985cfa12fb424cab29b2 100644
  34 --- a/test/test_commit.rb
  35 +++ b/test/test_commit.rb
  36 @@ -98,18 +98,6 @@ class TestCommit < Test::Unit::TestCase
  37      assert_equal true, diffs[5].new_file
  38    end
  39
  40 -  def test_diffs_on_initial_import_with_empty_commit
  41 -    Git.any_instance.expects(:show).with(
  42 -      {:full_index => true, :pretty => 'raw'},
  43 -      '634396b2f541a9f2d58b00be1a07f0c358b999b3'
  44 -    ).returns(fixture('show_empty_commit'))
  45 -
  46 -    @c = Commit.create(@r, :id => '634396b2f541a9f2d58b00be1a07f0c358b999b3')
  47 -    diffs = @c.diffs
  48 -
  49 -    assert_equal [], diffs
  50 -  end
  51 -
  52    # to_s
  53
  54    def test_to_s