diff options
| author | Sebastian Thiel <sebastian.thiel@icloud.com> | 2020-07-13 10:08:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-13 10:08:37 +0800 |
| commit | 3edd16ca6e217ee35353564cad3aa2920bc0c2e2 (patch) | |
| tree | 0f5cd65c1db04255862b8c19f4bf73cab435c4f0 /test/fixtures/diff_2f | |
| parent | 9cb7ae8d9721e1269f5bacd6dbc33ecdec4659c0 (diff) | |
| parent | e0b10d965d6377c409ceb40eb47379d79c3fef9f (diff) | |
| download | GitPython-3edd16ca6e217ee35353564cad3aa2920bc0c2e2.tar.gz GitPython-3edd16ca6e217ee35353564cad3aa2920bc0c2e2.zip | |
Merge pull request #1031 from priv-kweihmann/move-test-2nd
[RFC/WIP] move tests and avoid packaging them
Diffstat (limited to 'test/fixtures/diff_2f')
| -rw-r--r-- | test/fixtures/diff_2f | 19 |
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) |