[sysadmin-bin] Adjust indentation
- From: Andrea Veri <av src gnome org>
- To: gnome-sysadmin gnome org,commits-list gnome org
- Subject: [sysadmin-bin] Adjust indentation
- Date: Fri, 15 Dec 2017 12:51:39 +0000 (UTC)
commit f817cda41c5b230e68e7763e34918c5e3d5e25b3
Author: Andrea Veri <averi redhat com>
Date: Fri Dec 15 13:51:10 2017 +0100
Adjust indentation
git/pre-receive-check-policy | 76 +++++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 38 deletions(-)
---
diff --git a/git/pre-receive-check-policy b/git/pre-receive-check-policy
index f1b233c..e3f9074 100755
--- a/git/pre-receive-check-policy
+++ b/git/pre-receive-check-policy
@@ -112,14 +112,14 @@ check_ref_update() {
# Branch update
branchname=${refname#refs/heads/}
- is_wip=false
- is_master=false
- is_gnome=false
- case $branchname in
- wip/*) is_wip=true ;;
- master) is_master=true ;;
- gnome-*) is_gnome=true ;;
- esac
+ is_wip=false
+ is_master=false
+ is_gnome=false
+ case $branchname in
+ wip/*) is_wip=true ;;
+ master) is_master=true ;;
+ gnome-*) is_gnome=true ;;
+ esac
range=
case $change_type in
@@ -149,38 +149,38 @@ check_ref_update() {
fi
;;
update)
- range="$oldrev..$newrev"
- nonfastforward=false
- if [ "`git merge-base $oldrev $newrev`" != $oldrev ]; then
- # Non-fast-forward update. Right now we have
- # receive.denyNonFastforwards in the git configs for
- # our repositories anyways, but catching it here would
- # allow overriding without having to change the config
- # temporarily.
- if [ "`hostname`" == 'git.gnome.org' ]; then
- if ! $is_wip && ! forced; then
- nonfastforward=true
- fi
- elif [ "`hostname`" == 'gitlab.gnome.org' ]; then
- if ($is_master || $is_gnome); then
- nonfastforward=true
+ range="$oldrev..$newrev"
+ nonfastforward=false
+ if [ "`git merge-base $oldrev $newrev`" != $oldrev ]; then
+ # Non-fast-forward update. Right now we have
+ # receive.denyNonFastforwards in the git configs for
+ # our repositories anyways, but catching it here would
+ # allow overriding without having to change the config
+ # temporarily.
+ if [ "`hostname`" == 'git.gnome.org' ]; then
+ if ! $is_wip && ! forced; then
+ nonfastforward=true
+ fi
+ elif [ "`hostname`" == 'gitlab.gnome.org' ]; then
+ if ($is_master || $is_gnome); then
+ nonfastforward=true
+ fi
+ fi
fi
+
+ if $nonfastforward; then
+ cat <<- EOF >&2
+ ---
+ You are trying to update the branch '$branchname' in a way that is not
+ a fast-forward update. Please see:
+
+ https://wiki.gnome.org/Git/Help/NonFastForward
+ ---
+ EOF
+ exit 1
fi
- fi
-
- if $nonfastforward; then
- cat <<- EOF >&2
- ---
- You are trying to update the branch '$branchname' in a way that is not
- a fast-forward update. Please see:
-
- https://wiki.gnome.org/Git/Help/NonFastForward
- ---
- EOF
- exit 1
- fi
- ;;
- esac
+ ;;
+ esac
# For new commits introduced with this branch update, we want to run some
# checks to catch common mistakes.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]