* git-push2.sh: don't force push. Bad idea.

* update-stable.sh: support wrapfs-latest repo.

diff --git a/4a-gits b/4a-gits
index 6b0ee5ac9376e2192aa852bf02e99ede978de481..913f056aa32e613950c088ccb8b39f3fa017ac81 100755 (executable)
--- a/4a-gits
+++ b/4a-gits
@@ -2,7 +2,7 @@
 
 LIST=`echo wrapfs-2* wrapfs-3.[0-9] wrapfs-3.[0-9][0-9] wrapfs-4.[0-9] wrapfs-4.[0-9][0-9]`
 #LIST=`echo  wrapfs-4.1[1-9]  wrapfs-4.2[0-9]`
-#LIST="$LIST "`echo wrapfs-5.[0-9] wrapfs-5.[0-9][0-9]`
+LIST="$LIST "`echo wrapfs-5.[0-9] wrapfs-5.[0-9][0-9]`
 
 if test -z "$1" ; then
        echo "Usage: $0 [+l] cmd [args...]"

diff --git a/ChangeLog b/ChangeLog
index 658a07c4ac1e37aee695050ae0516bf47aba7c34..434b9adee07aa367787c535883db20b4c5448a10 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-12-16  Erez Zadok  <ezk@fsl.cs.sunysb.edu>
+
+       * git-push2.sh: don't force push.  Bad idea.
+
+       * update-stable.sh: support wrapfs-latest repo.
+
 2019-12-08  Erez Zadok  <ezk@fsl.cs.sunysb.edu>
 
        * restore-kconfig.sh: copy saved kernel configs from CVSROOT/wrapfs/

diff --git a/git-push2.sh b/git-push2.sh
index f861546fd4cf8b61ff366d4a23adaaa52823c6fe..b8f5431227c94717dac1488e92207e04ef5ff521 100755 (executable)
--- a/git-push2.sh
+++ b/git-push2.sh
@@ -12,7 +12,7 @@ for d in $DIRS ; do
        echo '######################################################################'
        echo "DIR: $d"
        cd "$d"
-       git push --all || git push -f --all
-       git push --tags || git push -f --tags
+       git push --all
+       git push --tags
     )
 done

diff --git a/update-stable.sh b/update-stable.sh
index 0724964fdff6e3752598c700306c4e508be159cb..e49b41bcbce29485663eace2759ed10c7de6423d 100755 (executable)
--- a/update-stable.sh
+++ b/update-stable.sh
@@ -34,8 +34,11 @@ else
 fi
 #echo THIS_REPO:$THIS_REPO
 case "$THIS_REPO" in
-    2.6.* | 3.* | 4.* | 5.* ) ;;
-    latest ) echo latest branch not supported yet
+    2.6.* | 3.* | 4.* | 5.* )
+       BRANCH="linux-${THIS_REPO}.y"
+       ;;
+    latest )
+       BRANCH="master"
        exit 1
        ;;
     * ) echo This repo is unknown: $THIS_REPO
@@ -45,8 +48,9 @@ esac
 
 runcmd git checkout master
 runcmd git describe
-runcmd git pull korg linux-${THIS_REPO}.y
-runcmd git pull --tags korg linux-${THIS_REPO}.y
+
+runcmd git pull korg ${BRANCH}
+runcmd git pull --tags korg ${BRANCH}
 runcmd git describe
 
 runcmd git checkout wrapfs