summaryrefslogtreecommitdiff
path: root/example
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2017-01-02 17:17:19 +0000
committerDaniel Silverstone <dsilvers@digital-scurf.org>2017-01-02 17:18:09 +0000
commit79fcfa572b7834f7768fa2fedb954059e47791f3 (patch)
tree7ea09a2f322885765b53bc04de07ca480a97b45c /example
parent8ddd848fe17864e59b4c293974cb2c50e3639082 (diff)
downloadgitano-79fcfa572b7834f7768fa2fedb954059e47791f3.tar.gz
cleanups: Whitespace and indentation and untabify
This is a massive unpleasant commit which does whitespace cleanup and fixes indentation (including untabifying). Hopefully we won't need to do this ever again, if we keep an eye on commits.
Diffstat (limited to 'example')
-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)