Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-13 16:56:00 +01:00
Code Issues Packages Projects Releases Activity

remove git format patch footer (#33357)

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@19752 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2020-05-05 11:56:05 +00:00
parent ff41de6f8e
commit 92fdcc1ce4
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/redmine/unified_diff.rb
View File

@@ -27,6 +27,12 @@ module Redmine
diff = diff.split("\n") if diff.is_a?(String)
@diff_type = options[:type] || 'inline'
@diff_style = options[:style]
# remove git footer
if diff.length > 1 &&
diff[-2] =~ /^--/ &&
diff[-1] =~ /^[0-9]/
diff.pop(2)
end
lines = 0
@truncated = false
diff_table = DiffTable.new(diff_type, diff_style)

20
test/unit/lib/redmine/unified_diff_test.rb
View File

@@ -449,8 +449,24 @@ class Redmine::UnifiedDiffTest < ActiveSupport::TestCase
assert_equal '-- ', footer_lines[0]
assert_equal '', footer_lines[-1]
diff = Redmine::UnifiedDiff.new(body_lines.join("\n") + "\n", :type => 'sbs')
assert_equal 1, diff.size
assert_equal 5, diff[0].size
diff_size = diff.size
diff_0_size = diff[0].size
assert_equal 1, diff_size
assert_equal 5, diff_0_size
diff = Redmine::UnifiedDiff.new("test\n", :type => 'sbs')
assert_equal 0, diff.size
diff = Redmine::UnifiedDiff.new("test\ntest\n", :type => 'sbs')
assert_equal 0, diff.size
diff = Redmine::UnifiedDiff.new(raw, :type => 'sbs')
assert_equal diff_size, diff.size
assert_equal diff_0_size, diff[0].size
diff = Redmine::UnifiedDiff.new(raw + "\n\n\n\n", :type => 'sbs')
assert_equal diff_size, diff.size
assert_equal diff_0_size, diff[0].size
end
private