diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-15 01:28:44 +0300 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-15 01:28:44 +0300 |
| commit | c8db25c37c0d78457d06117497ccde7ad80e2321 (patch) | |
| tree | dc2db4637c33c53b032a22f8e78975838396ed13 /lib/gitlab/diff | |
| parent | 6b9c730e91962a6d6343bcb7fc4dc75c99b41bde (diff) | |
| parent | 948bb655f3cba9909b7396c3062da7b22f4409b3 (diff) | |
Merge branch 'master' into issue_3945
Diffstat (limited to 'lib/gitlab/diff')
| -rw-r--r-- | lib/gitlab/diff/parser.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/diff/parser.rb b/lib/gitlab/diff/parser.rb index 177bad4b1cf..2c0a866e8ba 100644 --- a/lib/gitlab/diff/parser.rb +++ b/lib/gitlab/diff/parser.rb @@ -53,8 +53,9 @@ module Gitlab private def filename?(line) - line.start_with?('--- /dev/null', '+++ /dev/null', '--- a', '+++ b', - '--- /tmp/diffy', '+++ /tmp/diffy') + line.start_with?( '--- /dev/null', '+++ /dev/null', '--- a', '+++ b', + '+++ a', # The line will start with `+++ a` in the reverse diff of an orphan commit + '--- /tmp/diffy', '+++ /tmp/diffy') end def identification_type(line) |