diff options
| author | Johan Sørensen <johan@johansorensen.com> | 2008-02-09 21:41:15 +0100 |
|---|---|---|
| committer | Johan Sørensen <johan@johansorensen.com> | 2008-02-09 21:41:15 +0100 |
| commit | bf1b1f6305849d8f24c6cc260fda26c9d18cf7fa (patch) | |
| tree | 394927c923c76ee5055d50b06f1a574d6361c7ad /vendor/ruby-git | |
| parent | d7ea5403171813036e9effe9d62e68699cc26f34 (diff) | |
| download | gitorious-mainline-outdated-bf1b1f6305849d8f24c6cc260fda26c9d18cf7fa.zip gitorious-mainline-outdated-bf1b1f6305849d8f24c6cc260fda26c9d18cf7fa.tar.gz gitorious-mainline-outdated-bf1b1f6305849d8f24c6cc260fda26c9d18cf7fa.tar.bz2 | |
make ruby-git stricter about hte diff parsing it does
Diffstat (limited to 'vendor/ruby-git')
| -rw-r--r-- | vendor/ruby-git/lib/git/diff.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vendor/ruby-git/lib/git/diff.rb b/vendor/ruby-git/lib/git/diff.rb index b43ecd9..8020390 100644 --- a/vendor/ruby-git/lib/git/diff.rb +++ b/vendor/ruby-git/lib/git/diff.rb @@ -119,17 +119,17 @@ module Git final = {} current_file = nil @full_diff.split("\n").each do |line| - if m = /diff --git a\/(.*?) b\/(.*?)/.match(line) + if m = /^diff --git a\/(.*?) b\/(.*?)/.match(line) current_file = m[1] final[current_file] = {:patch => line, :path => current_file, :mode => '', :src => '', :dst => '', :type => 'modified'} else - if m = /index (.......)\.\.(.......)( ......)*/.match(line) + if m = /^index (.......)\.\.(.......)( ......)*/.match(line) final[current_file][:src] = m[1] final[current_file][:dst] = m[2] final[current_file][:mode] = m[3].strip if m[3] end - if m = /(.*?) file mode (......)/.match(line) + if m = /^(.*?) file mode (......)/.match(line) final[current_file][:type] = m[1] final[current_file][:mode] = m[2] end |