lib/docman/git_util.rb in docman-0.0.81 vs lib/docman/git_util.rb in docman-0.0.82
- old
+ new
@@ -17,11 +17,11 @@
end
def self.squash_commits(commit_count, message = nil)
message = "$(git log --format=%B --reverse HEAD..HEAD@{1})" unless message
exec "reset --soft HEAD~#{commit_count}"
- exec "commit -m \"#{message}\""
+ exec "commit --no-verify -m \"#{message}\""
end
def self.reset_repo(path)
Dir.chdir path
exec 'reset --hard'
@@ -82,11 +82,11 @@
def self.commit(root_path, path, message, tag = nil)
if repo_changed? path
# pull root_path
Dir.chdir root_path
exec %Q(add --all #{path.slice "#{root_path}/"})
- exec %Q(commit -m "#{message}") if repo_changed? path
+ exec %Q(commit --no-verify -m "#{message}") if repo_changed? path
self.tag(root_path, tag) if tag
Docman::Application.instance.commit_count = Docman::Application.instance.commit_count + 1
end
end
@@ -124,6 +124,6 @@
exec %Q(tag -a -m "Tagged to #{tag}" "#{tag}")
exec "push origin #{tag}"
end
end
-end
\ No newline at end of file
+end