diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-11-25 17:01:25 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-11-25 17:01:25 +0100 |
| commit | cb68eef0865df6aedbc11cd81888625a70da6777 (patch) | |
| tree | bd3018e6257574687b271b6c2e652ef943657471 /git/test/fixtures/diff_2f | |
| parent | 65747a216c67c3101c6ae2edaa8119d786b793cb (diff) | |
| download | GitPython-cb68eef0865df6aedbc11cd81888625a70da6777.tar.gz GitPython-cb68eef0865df6aedbc11cd81888625a70da6777.zip | |
Moved everything into the git subdirectory - some tests still need to be adjusted
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) |
