[v9_9] branchsync: don't update EXCLUDED

(cherry picked from commit aa2c42d959386abbd53c61456f277b20444487cf)

diff --git a/util/branchsync.sh b/util/branchsync.sh
index 4903f22bef8e3c4628c89ef57126310b1796b846..dc48c59a9f5611038336ee9a3da932be30b718cc 100644 (file)
--- a/util/branchsync.sh
+++ b/util/branchsync.sh
@@ -104,6 +104,10 @@ git log $SOURCEBRANCH --reverse --format='%H' $LASTHASH..$SOURCEBRANCH | \
             # cherry-pick was clean
             # restore the copyrights and api files
             git checkout HEAD -- util/copyrights lib/*/api
+            # don't update the EXCLUDED file
+            if [ -n `git ls-files EXCLUDED` ]; then
+                git checkout HEAD -- EXCLUDED
+            fi
             # note which hash we've merged
             savehash branchsync.dat $SOURCEBRANCH $hash