summaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorAdin Scannell <ascannell@google.com>2020-12-29 17:44:25 -0800
committergVisor bot <gvisor-bot@google.com>2020-12-29 17:46:00 -0800
commit3c58405a544dcd599bd84406b5d52848941675f7 (patch)
tree606c4761025171456f7caee57e61d1397dbbc918 /tools
parentd302c05700ab3474facded345d3d59d7cbc38184 (diff)
Exclude changing generated file from go_branch.
PiperOrigin-RevId: 349491589
Diffstat (limited to 'tools')
-rwxr-xr-xtools/go_branch.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/go_branch.sh b/tools/go_branch.sh
index ca07246a6..7ef4ddf83 100755
--- a/tools/go_branch.sh
+++ b/tools/go_branch.sh
@@ -89,8 +89,14 @@ git merge --no-commit --strategy ours "${head}" || \
find . -type f -exec chmod 0644 {} \;
find . -type d -exec chmod 0755 {} \;
-# Sync the entire gopath_dir.
-rsync --recursive --delete --exclude .git -L "${gopath_dir}/" .
+# Sync the entire gopath_dir. Note that we exclude auto-generated source
+# files that will change here. Otherwise, it adds a tremendous amount of noise
+# to commits. If this file disappears in the future, then presumably we will
+# still delete the underlying directory.
+rsync --recursive --delete \
+ --exclude .git \
+ --exclude webhook/pkg/injector/certs.go \
+ -L "${gopath_dir}/" .
# Add additional files.
for file in "${othersrc[@]}"; do