summaryrefslogtreecommitdiff
path: root/example/project-hooks/history-must-be-merges.update.lua
diff options
context:
space:
mode:
Diffstat (limited to 'example/project-hooks/history-must-be-merges.update.lua')
-rw-r--r--example/project-hooks/history-must-be-merges.update.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/example/project-hooks/history-must-be-merges.update.lua b/example/project-hooks/history-must-be-merges.update.lua
index 9cac773..28eb239 100644
--- a/example/project-hooks/history-must-be-merges.update.lua
+++ b/example/project-hooks/history-must-be-merges.update.lua
@@ -18,11 +18,11 @@ if branch then
commit = commit.content
local parents = commit.parents
if #parents < 2 then
- error("Detected non-merge-commit during parent walk, at " .. commit.sha)
+ error("Detected non-merge-commit during parent walk, at " .. commit.sha)
end
commit = parents[1]
end
-
+
log.state("Commits between old and new sha seem to all be merge commits")
else
log.state("Skipping commit history check on: " .. ref)