[Secure-testing-commits] r59018 - bin

[Salvatore Bonaccorso]

Author: carnil
Date: 2017-12-29 19:16:47 +0000 (Fri, 29 Dec 2017)
New Revision: 59018

Modified:
   bin/gen-DSA
Log:
In DLA mode: if git checkout found ask to push changes

Mention as well that a push is needed, not only a commit.

Signed-off-by: Salvatore Bonaccorso <carnil at debian.org>

Modified: bin/gen-DSA
===================================================================
--- bin/gen-DSA	2017-12-29 19:16:46 UTC (rev 59017)
+++ bin/gen-DSA	2017-12-29 19:16:47 UTC (rev 59018)
@@ -395,16 +395,18 @@
     echo "$IDMODE text written to ./$IDMODE-$DAID"
     if [ "$IDMODE" = "DLA" ]; then
 	idmode=$(echo "$IDMODE" | tr A-Z a-z)
-	if [ -d .svn ]; then
+	if [ -d .git ]; then
 	    echo "Made the following changes:"
-	    svn diff data/$IDMODE/list data/$idmode-needed.txt
+	    git diff -- data/$IDMODE/list data/$idmode-needed.txt
 	fi
-	warn "you need to commit the changes to data/$IDMODE/list and data/$idmode-needed.txt to actually reserve the $IDMODE-$DAID number and avoid conflicts with others."
-	if [ -d .svn ]; then
-	    echo -n "Do you want to commit them now ? [Yn] "
+	warn "you need to commit and push the changes to data/$IDMODE/list and data/$idmode-needed.txt to actually reserve the $IDMODE-$DAID number and avoid conflicts with others."
+	if [ -d .git ]; then
+	    echo -n "Do you want to commit and push them now ? [Yn] "
 	    read reply
 	    if [ "$reply" = "Y" ] || [ "$reply" = "" ] || [ "$reply" = "y" ]; then
-		svn commit -m "Reserve $IDMODE-$DAID for $PACKAGE" data/$IDMODE/list data/$idmode-needed.txt
+		git add data/$IDMODE/list data/$idmode-needed.txt
+		git commit -m "Reserve $IDMODE-$DAID for $PACKAGE"
+		git push origin master
 	    fi
 	fi
     fi