From 6c1ba442b438669e11eefbb53f6ae3abd3fc5dd6 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 25 Apr 2018 10:47:33 +0100 Subject: [PATCH] update-component-sha.sh: ignore changes in directories named "vendor" src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/linuxkit.go embeds a yaml fragement with some hashes in it, so avoid updating that since that would make the vendoring unclean. Signed-off-by: Ian Campbell --- scripts/update-component-sha.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/update-component-sha.sh b/scripts/update-component-sha.sh index a71303d0f..82dbd30b8 100755 --- a/scripts/update-component-sha.sh +++ b/scripts/update-component-sha.sh @@ -56,7 +56,7 @@ case "$1" in old=$2 new=$3 - git grep -w -l "\b$old\b" | xargs sed -i.bak -e "s,$old,$new,g" + git grep -w -l "\b$old\b" | grep -v /vendor/ | xargs sed -i.bak -e "s,$old,$new,g" ;; --image) case $# in @@ -69,7 +69,7 @@ case "$1" in hash=$3 ;; esac - git grep -E -l "\b$image:" | xargs sed -i.bak -E -e "s,$image:([[:xdigit:]]{40}|v[0-9\.]+),$image:$hash,g" + git grep -E -l "\b$image:" | grep -v /vendor/ | xargs sed -i.bak -E -e "s,$image:([[:xdigit:]]{40}|v[0-9\.]+),$image:$hash,g" ;; *) echo "Unknown mode $1"