Commit f2cb70f5 authored by Evan Hunt's avatar Evan Hunt
Browse files

[v9_9_sub] don't sync api file changes

parent 2e2ae088
...@@ -102,8 +102,8 @@ git log $SOURCEBRANCH --reverse --format='%H' $LASTHASH..$SOURCEBRANCH | \ ...@@ -102,8 +102,8 @@ git log $SOURCEBRANCH --reverse --format='%H' $LASTHASH..$SOURCEBRANCH | \
while read hash author; do while read hash author; do
if git cherry-pick -xn ${hash}; then if git cherry-pick -xn ${hash}; then
# cherry-pick was clean # cherry-pick was clean
# restore the copyrights file # restore the copyrights and api files
git checkout HEAD -- util/copyrights git checkout HEAD -- util/copyrights lib/*/api
# note which hash we've merged # note which hash we've merged
savehash branchsync.dat $SOURCEBRANCH $hash savehash branchsync.dat $SOURCEBRANCH $hash
...@@ -114,7 +114,7 @@ git log $SOURCEBRANCH --reverse --format='%H' $LASTHASH..$SOURCEBRANCH | \ ...@@ -114,7 +114,7 @@ git log $SOURCEBRANCH --reverse --format='%H' $LASTHASH..$SOURCEBRANCH | \
continue continue
elif [ -n "$interactive" ]; then elif [ -n "$interactive" ]; then
# interactive mode -- wait for user to fix things # 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 # note which hash we've merged
savehash branchsync.dat $SOURCEBRANCH $hash savehash branchsync.dat $SOURCEBRANCH $hash
else else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment