pull from FSL repos to ensure we're in sync there, before pulling from korg.

diff --git a/update-stable.sh b/update-stable.sh
index 61eb3055a3d8efbaace839412990a4cf511209ce..3cac22b44eb865663249838545189bd6641b592d 100755 (executable)
--- a/update-stable.sh
+++ b/update-stable.sh
@@ -47,13 +47,21 @@ case "$THIS_REPO" in
        ;;
 esac
 
+# first, sync with FSL git repos
+runcmd git checkout wrapfs
+runcmd git pull
+runcmd git pull --tags
 runcmd git checkout master
+runcmd git pull
+runcmd git pull --tags
 runcmd git describe
 
+# next, pull updates from kernel.org
 runcmd git pull korg ${BRANCH}
 runcmd git pull --tags korg ${BRANCH}
 runcmd git describe
 
+# finally, try to merge korg changes onto wrapfs branch
 runcmd git checkout wrapfs
 runcmd git describe
 runcmd git merge --no-edit master