5b7c4506ad
9289fd1 Merge pull request #125 from sachinkumarsingh092/optional-spelling-boilerplate-checks ad29307 Make the spelling and boilerplate checks optional 5f06d02 Merge pull request #124 from sachinkumarsingh092/fix-spellcheck-boilerplate-tests 48186eb Fix spelling and boilerplate errors 71690af Merge pull request #122 from sachinkumarsingh092/include-spellcheck-boilerplate-tests 981be3f Adding spelling and boilerplate checks. 2bb7525 Merge pull request #117 from fengzixu/master 3b6d17b Merge pull request #118 from pohly/cloud-build-timeout 9318c6c cloud build: double the timeout, now 1 hour 4ab8b15 use the tag to replace commit of csi-test 5d74e45 change the csi-test import path to v4 7dcd0a9 upgrade csi-test to v4.0.2 86ff580 Merge pull request #116 from andyzhangx/export-image-name c3a9662 allow export image name and registry name git-subtree-dir: release-tools git-subtree-split: 9289fd16c8e8aeb2759da3bcbd0937ed2913f011
42 lines
1.4 KiB
Bash
Executable File
42 lines
1.4 KiB
Bash
Executable File
#! /bin/sh -e
|
|
|
|
# Copyright 2019 The Kubernetes Authors.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
# This script verifies that the content of a directory managed
|
|
# by "git subtree" has not been modified locally. It does that
|
|
# by looking for commits that modify the files with the
|
|
# subtree prefix (aka directory) while ignoring merge
|
|
# commits. Merge commits are where "git subtree" pulls the
|
|
# upstream files into the directory.
|
|
#
|
|
# Theoretically a developer can subvert this check by modifying files
|
|
# in a merge commit, but in practice that shouldn't happen.
|
|
|
|
DIR="$1"
|
|
if [ ! "$DIR" ]; then
|
|
echo "usage: $0 <directory>" >&2
|
|
exit 1
|
|
fi
|
|
|
|
REV=$(git log -n1 --remove-empty --format=format:%H --no-merges -- "$DIR")
|
|
if [ "$REV" ]; then
|
|
echo "Directory '$DIR' contains non-upstream changes:"
|
|
echo
|
|
git log --no-merges -- "$DIR"
|
|
exit 1
|
|
else
|
|
echo "$DIR is a clean copy of upstream."
|
|
fi
|