From: ezk <ezk>
Date: Tue, 17 Dec 2019 04:37:36 +0000 (+0000)
Subject: * git-push2.sh: don't force push.  Bad idea.
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=7a32572ddf519bb134ac4834a95da136e3ca1143;p=wrapfs-mgmt.git

* 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 6b0ee5a..913f056 100755
--- 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 658a07c..434b9ad 100644
--- 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 f861546..b8f5431 100755
--- 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 0724964..e49b41b 100755
--- 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