aboutsummaryrefslogtreecommitdiff
path: root/test/fixtures/diff_2f
diff options
context:
space:
mode:
authorMichael Trier <mtrier@gmail.com>2008-05-07 16:49:48 -0400
committerMichael Trier <mtrier@gmail.com>2008-05-07 16:49:48 -0400
commit33ebe7acec14b25c5f84f35a664803fcab2f7781 (patch)
tree960b40fe368a9882221bcdd8635b9080dec01ec6 /test/fixtures/diff_2f
downloadGitPython-33ebe7acec14b25c5f84f35a664803fcab2f7781.tar.gz
GitPython-33ebe7acec14b25c5f84f35a664803fcab2f7781.zip
initial project
Diffstat (limited to 'test/fixtures/diff_2f')
-rw-r--r--test/fixtures/diff_2f19
1 files changed, 19 insertions, 0 deletions
diff --git a/test/fixtures/diff_2f b/test/fixtures/diff_2f
new file mode 100644
index 00000000..5246cd6b
--- /dev/null
+++ b/test/fixtures/diff_2f
@@ -0,0 +1,19 @@
+diff --git a/lib/grit/commit.rb b/lib/grit/commit.rb
+index a093bb1db8e884cccf396b297259181d1caebed4..80fd3d527f269ecbd570b65b8e21fd85baedb6e9 100644
+--- a/lib/grit/commit.rb
++++ b/lib/grit/commit.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)