[master] don't sync api file changes

(cherry picked from commit f2cb70f5d758495195ee53e593e75721bbbc80f0)

diff --git a/util/branchsync.sh b/util/branchsync.sh
index 723239cc1ff0b254d22eb49967aee648ba097235..bfba19e900490b0461a58269847f71cd7930547f 100644 (file)
--- a/util/branchsync.sh
+++ b/util/branchsync.sh
@@ -102,8 +102,8 @@ git log $SOURCEBRANCH --reverse --format='%H' $LASTHASH..$SOURCEBRANCH | \
     while read hash author; do
         if git cherry-pick -xn ${hash}; then
             # cherry-pick was clean
-            # restore the copyrights file
-            git checkout HEAD -- util/copyrights
+            # restore the copyrights and api files
+            git checkout HEAD -- util/copyrights lib/*/api
             # note which hash we've merged
             savehash branchsync.dat $SOURCEBRANCH $hash
 
@@ -114,7 +114,7 @@ git log $SOURCEBRANCH --reverse --format='%H' $LASTHASH..$SOURCEBRANCH | \
             continue
         elif [ -n "$interactive" ]; then
             # interactive mode -- wait for user to fix things
-            git checkout HEAD -- util/copyrights
+            git checkout HEAD -- util/copyrights lib/*/api
             # note which hash we've merged
             savehash branchsync.dat $SOURCEBRANCH $hash
         else