You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
55 lines
1.9 KiB
55 lines
1.9 KiB
diff --git a/lib/grit/commit.rb b/lib/grit/commit.rb
|
|
index a093bb1db8e884cccf396b297259181d1caebed4..80fd3d527f269ecbd570b65b8e21fd85baedb6e9 100644
|
|
--- a/lib/grit/com mit.rb
|
|
+++ b/lib/grit/com mit.rb
|
|
@@ -156,12 +156,8 @@ module Grit
|
|
|
|
def diffs
|
|
if parents.empty?
|
|
- diff = @repo.git.show({:full_index => true, :pretty => 'raw'}, @id)
|
|
- if diff =~ /diff --git a/
|
|
- diff = diff.sub(/.+?(diff --git a)/m, '\1')
|
|
- else
|
|
- diff = ''
|
|
- end
|
|
+ diff = @repo.git.show({:full_index => true, :pretty => 'raw'}, @id)
|
|
+ diff = diff.sub(/.+?(diff --git a)/m, '\1')
|
|
Diff.list_from_string(@repo, diff)
|
|
else
|
|
self.class.diff(@repo, parents.first.id, @id)
|
|
diff --git a/test/fixtures/show_empty_commit b/test/fixtures/show_empty_commit
|
|
deleted file mode 100644
|
|
index ea25e32a409fdf74c1b9268820108d1c16dcc553..0000000000000000000000000000000000000000
|
|
--- a/test/fixtures/show_empty_commit
|
|
+++ /dev/null
|
|
@@ -1,6 +0,0 @@
|
|
-commit 1e3824339762bd48316fe87bfafc853732d43264
|
|
-tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
|
|
-author Tom Preston-Werner <tom@mojombo.com> 1157392833 +0000
|
|
-committer Tom Preston-Werner <tom@mojombo.com> 1157392833 +0000
|
|
-
|
|
- initial directory structure
|
|
diff --git a/test/test_commit.rb b/test/test_commit.rb
|
|
index fdeb9000089b052f0b31a845e0173e9b089e06a0..bdbc450e08084d7d611e985cfa12fb424cab29b2 100644
|
|
--- a/test/test_commit.rb
|
|
+++ b/test/test_commit.rb
|
|
@@ -98,18 +98,6 @@ class TestCommit < Test::Unit::TestCase
|
|
assert_equal true, diffs[5].new_file
|
|
end
|
|
|
|
- def test_diffs_on_initial_import_with_empty_commit
|
|
- Git.any_instance.expects(:show).with(
|
|
- {:full_index => true, :pretty => 'raw'},
|
|
- '634396b2f541a9f2d58b00be1a07f0c358b999b3'
|
|
- ).returns(fixture('show_empty_commit'))
|
|
-
|
|
- @c = Commit.create(@r, :id => '634396b2f541a9f2d58b00be1a07f0c358b999b3')
|
|
- diffs = @c.diffs
|
|
-
|
|
- assert_equal [], diffs
|
|
- end
|
|
-
|
|
# to_s
|
|
|
|
def test_to_s
|