sh/merge-with-custom-msg: add pill update check [ci skip]
It's very easy to forget to verify that pills have been updated
accordingly when the kernel changes.  This adds a warning that prints
when the kernel in the target has changed but the pills have not.
Also prompts the user for confirmation pre-merge.
@@ -45,5 +45,18 @@ TARGET=$(echo $REV | sed s_origin/__)
MERGE_MSG="Merge branch '$TARGET' (#$PR)"
+KERNEL_CHANGED=`git diff --name-status $TARGET -- pkg/arvo/sys`
+PILLS_CHANGED=`git diff --name-status $TARGET -- bin`
+
+[[ ! -z $KERNEL_CHANGED && -z $PILLS_CHANGED ]] && \
+ echo "WARNING: kernel has changed, but pills have not"
+ echo $KERNEL_CHANGED
+ echo
+
+read -p "Proceed with merge? (y/n)" -n 1 -r
+echo
+if [[ $REPLY =~ ^[Yy]$ ]]
+then
git merge --no-ff --signoff --log -m "$MERGE_MSG" $REV
+fi
