From: ezk <ezk>
Date: Sun, 3 Feb 2019 12:02:01 +0000 (+0000)
Subject: update scripts
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=9bf264000fc8f6c31eec60e3a15dc810ef9b7aef;p=wrapfs-mgmt.git

update scripts
---

diff --git a/4a-gits b/4a-gits
index 97faa56..8350bed 100755
--- a/4a-gits
+++ b/4a-gits
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-LIST=`/bin/ls -1d wrapfs-*/.git | cut -d/ -f1`
+LIST=`echo wrapfs-2* wrapfs-3.[0-9].y wrapfs-3.[0-9][0-9].y wrapfs-4.[0-9].y wrapfs-4.[0-9][0-9].y wrapfs-latest`
+#LIST=`echo wrapfs-4.[0-9].y wrapfs-4.[0-9][0-9].y`
 
 if test -z "$1" ; then
 	echo "Usage: $0 [+[alw]] cmd [args...]"
diff --git a/git-push2.sh b/git-push2.sh
index e6be8b8..970ab51 100755
--- a/git-push2.sh
+++ b/git-push2.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-set -x
+#set -x
 
 if test -n "$1" ; then
     DIRS="$@"
diff --git a/update-stable.sh b/update-stable.sh
index abb9d28..712474f 100755
--- a/update-stable.sh
+++ b/update-stable.sh
@@ -42,7 +42,12 @@ case "$THIS_REPO" in
 	;; 
 esac
 
-nruncmd git checkout master
-nruncmd git pull korg $THIS_REPO
-nruncmd git checkout wrapfs
-nruncmd git merge wrapfs
+runcmd git checkout master
+runcmd git describe
+runcmd git pull korg linux-${THIS_REPO}.y
+runcmd git describe
+
+runcmd git checkout wrapfs
+runcmd git describe
+runcmd git merge --no-edit master
+runcmd git describe