diff options
| author | Sebastian Thiel <sebastian.thiel@icloud.com> | 2020-07-12 18:04:26 +0800 |
|---|---|---|
| committer | Sebastian Thiel <sebastian.thiel@icloud.com> | 2020-07-12 18:04:26 +0800 |
| commit | d5f0d48745727684473cf583a002e2c31174de2d (patch) | |
| tree | 2c499fe4cb719e8b95d74449363bc20cf280bcce /git/test/fixtures/diff_2f | |
| parent | fe65adc904f3e3ebf74e983e91b4346d5bacc468 (diff) | |
| download | GitPython-d5f0d48745727684473cf583a002e2c31174de2d.tar.gz GitPython-d5f0d48745727684473cf583a002e2c31174de2d.zip | |
Revert moving tests out of 'git' folder, related to #1030
Diffstat (limited to 'git/test/fixtures/diff_2f')
| -rw-r--r-- | git/test/fixtures/diff_2f | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/git/test/fixtures/diff_2f b/git/test/fixtures/diff_2f new file mode 100644 index 00000000..5246cd6b --- /dev/null +++ b/git/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) |