Skip to content

Restore MERGE_HEAD and CHERRY_PICK_HEAD without newline #188

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

Merged
merged 1 commit into from
Apr 18, 2015
+2 −2
Merged

Restore MERGE_HEAD and CHERRY_PICK_HEAD without newline #188

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions lib/overcommit/git_repo.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def restore_merge_state
FileUtils.touch(File.expand_path('MERGE_MODE', Overcommit::Utils.git_dir))

File.open(File.expand_path('MERGE_HEAD', Overcommit::Utils.git_dir), 'w') do |f|
f.write("#{@merge_head}\n")
f.write(@merge_head)
end
@merge_head = nil
end
Expand All @@ -186,7 +186,7 @@ def restore_cherry_pick_state
if @cherry_head
File.open(File.expand_path('CHERRY_PICK_HEAD',
Overcommit::Utils.git_dir), 'w') do |f|
f.write("#{@cherry_head}\n")
f.write(@cherry_head)
end
@cherry_head = nil
end
Expand Down