aboutsummaryrefslogtreecommitdiff
path: root/git/test/fixtures/diff_2
diff options
context:
space:
mode:
authorKonrad Weihmann <kweihmann@outlook.com>2020-07-10 18:41:02 +0200
committerSebastian Thiel <sebastian.thiel@icloud.com>2020-07-12 17:13:10 +0800
commit5453888091a86472e024753962a7510410171cbc (patch)
treee882bf4c02439e70fcb5938c1484216d04430ef4 /git/test/fixtures/diff_2
parent9b7839e6b55953ddac7e8f13b2f9e2fa2dea528b (diff)
downloadGitPython-5453888091a86472e024753962a7510410171cbc.tar.gz
GitPython-5453888091a86472e024753962a7510410171cbc.zip
tests: move to root dir
This should ensure that tests are NOT packaged into release package by setuptools, as tests are development only + fixtures after moving Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Diffstat (limited to 'git/test/fixtures/diff_2')
-rw-r--r--git/test/fixtures/diff_254
1 files changed, 0 insertions, 54 deletions
diff --git a/git/test/fixtures/diff_2 b/git/test/fixtures/diff_2
deleted file mode 100644
index 218b6bae..00000000
--- a/git/test/fixtures/diff_2
+++ /dev/null
@@ -1,54 +0,0 @@
-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