diff options
| -rwxr-xr-x | renew-config | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/renew-config b/renew-config index f90fdd3..e9aea35 100755 --- a/renew-config +++ b/renew-config @@ -12,17 +12,9 @@ fi git push origin master 2>/dev/null -if ! diff -q "$REPO/Metadata/clients.xml" "$REAL/Metadata/clients.xml" >/dev/null; then - echo "$REPO: Metadata/clients.xml out of date." 1>&2 - echo "You probably should update it with $REAL/Metadata/clients.xml" 1>&2 - echo 1>&2 - $DIFF -u "$REPO/Metadata/clients.xml" "$REAL/Metadata/clients.xml" 1>&2 - echo 1>&2 - echo "Maybe you want:" 1>&2 - error "cp -i '$REAL/Metadata/clients.xml' '$REPO/Metadata/clients.xml'" -fi - -if [ -n "$(git rev-list HEAD..origin/master)" ]; then +# check if remote is up to date +git fetch git@git.spline.de:bcfg2-repository +if [ -n "$(git rev-list HEAD..FETCH_HEAD)" ]; then error "$REPO: HEAD does not equal to origin/master." fi |