summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2018-01-04 11:24:16 +0100
committerMatthias Beyer <mail@beyermatthias.de>2018-01-04 11:24:46 +0100
commitdb33d46608afbe95538af331a7571efd0d0c5be9 (patch)
tree0b64361a3926309b99f2d98f9e0d56af33f860c1 /scripts
parent2fd6a701aeed4fbff3e8f5c3207e1cfcc2a2dd5f (diff)
Fix spacing
Diffstat (limited to 'scripts')
-rw-r--r--scripts/hooks/pre-push.fixup-warn.sh16
-rw-r--r--scripts/signed-off-by-in-branch.sh2
2 files changed, 1 insertions, 17 deletions
diff --git a/scripts/hooks/pre-push.fixup-warn.sh b/scripts/hooks/pre-push.fixup-warn.sh
index 3f0c393e..77a2c112 100644
--- a/scripts/hooks/pre-push.fixup-warn.sh
+++ b/scripts/hooks/pre-push.fixup-warn.sh
@@ -34,22 +34,6 @@ do
# TO NOT ONLY WARN BUT ABORT UNCOMMENT THE NEXT LINE
# exit 1
fi
-
- # Check for commits without sign-off
- if [ "$remote_sha" = $z40 ]; then
- # New branch is pushed, we only want to check commits that are not
- # on master.
- range="$(git merge-base master "$local_sha")..$local_sha"
- fi
- while read ref; do
- msg=$(git log -n 1 --format=%B "$ref")
- if ! grep -q '^Signed-off-by: ' <<<"$msg"; then
- echo >&2 "Unsigned commit $ref"
- exit 1
- fi
- done < <(git rev-list "$range")
- # The process substitution above is a hack to make sure loop runs in
- # the same shell and can actually exit the whole script.
fi
done
diff --git a/scripts/signed-off-by-in-branch.sh b/scripts/signed-off-by-in-branch.sh
index 480f5a0a..a7a49452 100644
--- a/scripts/signed-off-by-in-branch.sh
+++ b/scripts/signed-off-by-in-branch.sh
@@ -12,6 +12,6 @@ then
echo >&2 "All good"
else
echo -en >&2 "${RED}Got $faulty non Signed-off-by commits${NORMAL}"
- echo -e >&2 "${RED}between $1 and $2${NORMAL}"
+ echo -e >&2 "${RED} between $1 and $2${NORMAL}"
fi