[PATCH 04/12] 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@debian.org>
---
bin/gen-DSA | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/bin/gen-DSA b/bin/gen-DSA
index cdb4407312..0eb389d51c 100755
--- a/bin/gen-DSA
+++ b/bin/gen-DSA
@@ -395,16 +395,18 @@ EOF
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
--
2.15.1
Reply to: