Skip to content

Handle commits with empty lines in the message #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Handle commits with empty lines in the message #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a8c93a
Handle commits with empty lines in the message
ohtake Sep 12, 2013
773e818
Add test for empry lines in commit message
tnaoto Sep 12, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/git/lib.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,10 @@ def process_commit_data(data, sha = nil, indent = 4)

data.each do |line|
line = line.chomp
if line == ''
if line == '' and hsh_array
in_message = !in_message
elsif line == '' and !hsh_array and !in_message
in_message = true
elsif in_message
hsh['message'] << line[indent..-1] << "\n"
else
Expand Down
Binary file added tests/files/working.git/objects/32/77d9f9880e662bf701c7f42a50db6e5053b001
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions tests/files/working.git/refs/heads/test_empty_lines
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3277d9f9880e662bf701c7f42a50db6e5053b001
Binary file added tests/files/working/dot_git/objects/32/77d9f9880e662bf701c7f42a50db6e5053b001
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions tests/files/working/dot_git/refs/heads/test_empty_lines
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3277d9f9880e662bf701c7f42a50db6e5053b001
7 changes: 6 additions & 1 deletion tests/units/test_object.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,12 @@ def test_commit_contents
assert_equal('tree 94c827875e2cadb8bc8d4cdd900f19aa9e8634c7', o.contents_array[0])
assert_equal('parent 546bec6f8872efa41d5d97a369f669165ecda0de', o.contents_array[1])
end


def test_commit_multiline
o = @git.gcommit('3277d9f9880e662bf701c7f42a50db6e5053b001')
assert_equal("test-empty-lines\n\n1\n2\n\n3\n4", o.message)
end

def test_object_to_s
assert_equal('1cc8667014381e2788a94777532a788307f38d26', @commit.sha)
assert_equal('94c827875e2cadb8bc8d4cdd900f19aa9e8634c7', @tree.sha)
Expand Down