From 4fbb3d451fbac23edab37513985b095b214e97ff Mon Sep 17 00:00:00 2001
From: Istio Automation <istio-testing-bot@google.com>
Date: Wed, 5 Oct 2022 10:36:39 -0700
Subject: [PATCH] Automator: update common-files@master in istio/api@master
 (#2494)

---
 LICENSE                   | 2 +-
 common/.commonfiles.sha   | 2 +-
 common/Makefile.common.mk | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index 56e48aa3..bb7b19de 100644
--- a/LICENSE
+++ b/LICENSE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2016-2020 Istio Authors
+   Copyright 2016-2022 Istio Authors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index b283210a..fd88ff0b 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-7d0c516aa1d8d1b353ab3c3c350e86f04f936b0b
+3bb9227619a8e384d453d92f6e4a167947a6931c
diff --git a/common/Makefile.common.mk b/common/Makefile.common.mk
index a18d54ac..1ec9a810 100644
--- a/common/Makefile.common.mk
+++ b/common/Makefile.common.mk
@@ -98,6 +98,10 @@ update-common:
 	@git clone -q --depth 1 --single-branch --branch $(UPDATE_BRANCH) https://github.com/istio/common-files $(TMP)/common-files
 	@cd $(TMP)/common-files ; git rev-parse HEAD >files/common/.commonfiles.sha
 	@rm -fr common
+	@CONTRIB_OVERRIDE=$(shell grep -l "istio/community/blob/master/CONTRIBUTING.md" CONTRIBUTING.md)
+	@if [ "$(CONTRIB_OVERRIDE)" != "CONTRIBUTING.md" ]; then\
+		rm $(TMP)/common-files/files/CONTRIBUTING.md;\
+	fi
 	@cp -a $(TMP)/common-files/files/* $(shell pwd)
 	@rm -fr $(TMP)/common-files