diff options
| author | Salvatore Bonaccorso <carnil@debian.org> | 2017-12-29 19:16:47 +0000 |
|---|---|---|
| committer | Salvatore Bonaccorso <carnil@debian.org> | 2017-12-29 19:16:47 +0000 |
| commit | 052c6605f763a95f78e1eef577a9abc98523abbd (patch) | |
| tree | 9dc89ac3e04ae2b77426e1fdd27900ba434e257b /bin/gen-DSA | |
| parent | 8bb3097f3053b02af992fae464cc0414d6c87590 (diff) | |
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>
git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@59018 e39458fd-73e7-0310-bf30-c45bca0a0e42
Diffstat (limited to 'bin/gen-DSA')
| -rwxr-xr-x | bin/gen-DSA | 14 |
1 files 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 |