X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=8ec547f35d5e35a992edc28e49be323f8a901990;hb=c3859c54f45adfb296858249c26a9d1b09c94112;hp=5b7ef8cce128d5bc1a5903ac673d4c95a27bd90b;hpb=2eab636d6e37cd612c1a77bb50d4e30458724f6a;p=feisty_meow.git diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 5b7ef8cc..8ec547f3 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -15,9 +15,7 @@ source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh" # this appears to be an ubuntu issue, where xenial did not provide it even though the # feature appeared in git 2.6 and xenial claims it has git version 2.7.4. eventually, # this version test can go away. -gitvertest="$(git version | sed -e 's/git version [0-9]\.//' | sed -e 's/\.0$//' )" -#hmmm: temp below! -echo gitvertest is $gitvertest +gitvertest="$(git version | sed -e 's/git version [0-9]\.//' | sed -e 's/\.[0-9][0-9]*$//' )" if (( $gitvertest >= 11 )); then # auto-stash is not available until 2.6 for git, but ubuntu is misreporting or using a # differing version number somehow. we are sure autostash was missing on ubuntu xenial