update scripts

diff --git a/4a-gits b/4a-gits
index 97faa56efefe63e630702042e7cc38a29bfde67a..8350bed76082ce04d4aacddb66d1bb109e26ca43 100755 (executable)
--- 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 e6be8b87455409872b1bab20a6eaf0dfa520a453..970ab51e11aacdfceba093292abd998f40da0dd0 100755 (executable)
--- 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 abb9d286423a014a92c693a3ddbada69f3ec7289..712474fb025c363b2f27b71621b20f28486c1248 100755 (executable)
--- 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