From: Evan Hunt <each@isc.org>
Date: Tue, 30 Apr 2013 17:05:06 +0000 (-0700)
Subject: [v9_9] branchsync: don't update EXCLUDED
X-Git-Tag: v9.9.3~21
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=3e543e5102fe2687ec068fb66643ef2d66c922d5;p=thirdparty%2Fbind9.git

[v9_9] branchsync: don't update EXCLUDED
(cherry picked from commit aa2c42d959386abbd53c61456f277b20444487cf)
---

diff --git a/util/branchsync.sh b/util/branchsync.sh
index 4903f22bef8..dc48c59a9f5 100644
--- 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