From f0823fc624a5d5007a2257f478028e30a7197bcb Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Tue, 26 Mar 2013 18:48:35 -0700 Subject: [PATCH] [master] don't sync api file changes (cherry picked from commit f2cb70f5d758495195ee53e593e75721bbbc80f0) --- util/branchsync.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/util/branchsync.sh b/util/branchsync.sh index 723239cc1f..bfba19e900 100644 --- 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