X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Frev_control%2Fversion_control.sh;h=0c8cec27eb097936b340c611d8c7bda5fbf27b7a;hb=24c0b2616ed766b908d187d7de9cbd594224c98f;hp=a981b59c1f91a337339bc0d1ccc8722783acc280;hpb=233fcc778459e8c21bc89e128abfe5a1e42c2f96;p=feisty_meow.git

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index a981b59c..0c8cec27 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -11,12 +11,19 @@ source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh"
 
 ##############
 
-gitvertest="$(git version | sed -e 's/git version [0-9]\.//' | sed -e 's/\.0$//' )"
-echo gitvertest is $gitvertest
-if [[ $gitvertest > 9 ]]; then
-  # we believe auto-stash is not available until 2.9, but we are sure it was missing
-  # on ubuntu xenial with git 2.7.4.
-  PULL_ADDITION='--rebase --autostash'
+# check git version to see if we can use autostash.
+# 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-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
+  # with git 2.7.4 and it's definitely present in zesty with git at 2.11.
+#  PULL_ADDITION='--rebase --autostash'
+#although initially attractive, above set of flags seems to lose history we don't want to
+#lose.
+PULL_ADDITION=
 fi
 
 ##############