diff options
| author | Parabola git <git@parabola.nu> | 2020-12-15 05:00:02 +0000 |
|---|---|---|
| committer | Parabola git <git@parabola.nu> | 2020-12-15 05:00:02 +0000 |
| commit | 475339dccdeeb7cd08fd7682c1839ed80e20b6b0 (patch) | |
| tree | d08ba8f2255012a90017e8dcfd974d0106eb04da /abslibre/abslibre.git | |
| parent | 15dbd0089eee0fd0c5070e05f46cf85953037392 (diff) | |
Update from cron
Diffstat (limited to 'abslibre/abslibre.git')
| -rw-r--r-- | abslibre/abslibre.git/config | 4 | ||||
| -rwxr-xr-x | abslibre/abslibre.git/hooks/commit-msg.wip (renamed from abslibre/abslibre.git/hooks/commit-msg) | 0 | ||||
| -rwxr-xr-x | abslibre/abslibre.git/hooks/update | 10 |
3 files changed, 12 insertions, 2 deletions
diff --git a/abslibre/abslibre.git/config b/abslibre/abslibre.git/config index d456fa6..1939e6d 100644 --- a/abslibre/abslibre.git/config +++ b/abslibre/abslibre.git/config @@ -3,5 +3,5 @@ filemode = true bare = true -[receive] - denyNonFastForwards = true +#[receive] +# denyNonFastForwards = true diff --git a/abslibre/abslibre.git/hooks/commit-msg b/abslibre/abslibre.git/hooks/commit-msg.wip index 0f8af85..0f8af85 100755 --- a/abslibre/abslibre.git/hooks/commit-msg +++ b/abslibre/abslibre.git/hooks/commit-msg.wip diff --git a/abslibre/abslibre.git/hooks/update b/abslibre/abslibre.git/hooks/update new file mode 100755 index 0000000..88bbee5 --- /dev/null +++ b/abslibre/abslibre.git/hooks/update @@ -0,0 +1,10 @@ +#!/bin/bash + +ref=$1 +prev_sha=$2 +next_sha=$3 + +# prevent re-writing history on master branch +# autobuilder can not handle non-fast-forward commits +[[ "${ref}" != 'master' ]] || \ +git merge-base --is-ancestor "${prev_sha}" "${next_sha}" |