From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Sun, 8 May 2022 22:04:02 +0000 (-0400)
Subject: pull from FSL repos to ensure we're in sync there, before pulling from korg.
X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=0cf62a21a0141961eb82f329ba801f76f42b4ff7;p=wrapfs-mgmt.git

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 61eb305..3cac22b 100755
--- 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