From e8193519bab349bc3faf572dbdc04e0ef531449c Mon Sep 17 00:00:00 2001 From: xuu Date: Thu, 7 Dec 2017 14:14:34 -0700 Subject: [PATCH] add check-remote --- check-remote | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100755 check-remote diff --git a/check-remote b/check-remote new file mode 100755 index 000000000..b0dd0419a --- /dev/null +++ b/check-remote @@ -0,0 +1,25 @@ +#!/bin/sh -e + +if [ $# -lt 3 ] + then + echo "Usage: $0 GIT-USER GIT-BRANCH USER-MNT" + exit +fi + +clean_up() { + git merge --abort > /dev/null +} + + + +(git merge HEAD || clean_up) > /dev/null +git pull --ff-only > /dev/null +if ! git config remote.$1.url > /dev/null; then + git remote add $1 git@git.dn42:$1/registry.git +fi +git fetch $1 2> /dev/null +git merge --no-ff --no-commit $1/$2 2> /dev/null +./check-pol HEAD $3 2> /dev/null || (echo "Policy Check FAILED"; clean_up; exit 1) +./check-my-stuff $3 2> /dev/null || (echo "Schema Check FAILED"; clean_up; exit 1) +echo OK +clean_up