336f826a6f
1d60e779 Merge pull request #131 from pohly/kubernetes-1.20-tag 9f104590 prow.sh: support building Kubernetes for a specific version fe1f2848 Merge pull request #121 from kvaps/namespace-check 8fdf0f78 Merge pull request #128 from fengzixu/master 1c94220d fix: fix a bug of csi-sanity a4c41e6a Merge pull request #127 from pohly/fix-boilerplate ece0f500 check namespace for snapshot-controller dbd89672 verify-boilerplate.sh: fix path to script 9289fd16 Merge pull request #125 from sachinkumarsingh092/optional-spelling-boilerplate-checks ad29307f Make the spelling and boilerplate checks optional 5f06d024 Merge pull request #124 from sachinkumarsingh092/fix-spellcheck-boilerplate-tests 48186eba Fix spelling and boilerplate errors 71690aff Merge pull request #122 from sachinkumarsingh092/include-spellcheck-boilerplate-tests 981be3fe Adding spelling and boilerplate checks. 2bb75253 Merge pull request #117 from fengzixu/master 4ab8b154 use the tag to replace commit of csi-test 5d74e455 change the csi-test import path to v4 7dcd0a99 upgrade csi-test to v4.0.2 git-subtree-dir: release-tools git-subtree-split: 1d60e7792624a9938c0bd1b045211fbb89e513d6
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
|