diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-02-16 00:20:18 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-19 21:14:54 +0300 |
| commit | 169070ba4b83b1cbb4084abcf8ffeb9f492fcffa (patch) | |
| tree | d8491d0a1058b8f2b2d66ee81388417566560e29 /app/models/repository.rb | |
| parent | 6908663479b267cd82402439a3e5059a1477b4d9 (diff) | |
Some updates from last code review.
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index e7eef6ea21e..be30a3b0906 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -626,9 +626,9 @@ class Repository args << { mainline: 1 } if commit.merge_commit? revert_index = rugged.revert_commit(*args) - tree_id = revert_index.write_tree(rugged) - return false if revert_index.conflicts? + + tree_id = revert_index.write_tree(rugged) return false unless diff_exists?(source_sha, tree_id) commit_with_hooks(user, target_branch) do |ref| |