From: Richard Hartmann <RichiH@users.noreply.github.com>
Date: Sun, 27 Aug 2017 19:28:51 +0000 (+0200)
Subject: Merge pull request #223 from madduck/fix-git-version-parsing
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/8cee7f8f17f752e0dd2d60e43f9a2dbd87f881fc?ds=sidebyside;hp=-c

Merge pull request #223 from madduck/fix-git-version-parsing

Fix parsing of Git version numbers
---

8cee7f8f17f752e0dd2d60e43f9a2dbd87f881fc
diff --combined vcsh
index ce6705d,543a75e..7a63b2b
--- a/vcsh
+++ b/vcsh
@@@ -22,9 -22,6 +22,9 @@@
  VERSION='1.20141026'
  SELF=$(basename $0)
  
 +# Ensure all files created are accessible only to the current user.
 +umask 0077
 +
  fatal() {
  	echo "$SELF: fatal: $1" >&2
  	[ -z $2 ] && exit 1
@@@ -109,7 -106,6 +109,7 @@@ help() 
     commit               Commit in all repositories
     delete <repo>        Delete an existing repository
     enter <repo>         Enter repository; spawn new instance of \$SHELL
 +                        with \$GIT_DIR set.
     foreach [<-g>]
       <git command>      Execute a command for every repository
     help                 Display this help text
@@@ -166,7 -162,7 +166,7 @@@ clone() 
    You should add files to your new repository."
  		exit
  	fi
- 	GIT_VERSION_MAJOR=$(git --version | sed -n 's/.* \([0-9]\)\..*/\1/p' )
+ 	GIT_VERSION_MAJOR=$(git --version | sed -n 's/.* \([0-9]\+\)\..*/\1/p' )
  	if [ 1 -lt "$GIT_VERSION_MAJOR" ];then
  		git fetch origin "$VCSH_BRANCH"
  	else
@@@ -265,7 -261,7 +265,7 @@@ init() 
  	[ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
  	mkdir -p "$VCSH_BASE" || fatal "could not create '$VCSH_BASE'" 50
  	cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
 -	git init --shared=0600
 +	git init --shared=false
  	upgrade
  	hook post-init
  }
@@@ -481,8 -477,8 +481,8 @@@ write_gitignore() 
  	use
  	cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
  	local GIT_VERSION="$(git --version)"
- 	local GIT_VERSION_MAJOR=$(echo $GIT_VERSION | sed -n 's/.* \([0-9]\)\..*/\1/p')
- 	local GIT_VERSION_MINOR=$(echo $GIT_VERSION | sed -n 's/.* \([0-9]\)\.\([0-9]\)\..*/\2/p')
+ 	local GIT_VERSION_MAJOR=$(echo $GIT_VERSION | sed -n 's/.* \([0-9]\+\)\..*/\1/p')
+ 	local GIT_VERSION_MINOR=$(echo $GIT_VERSION | sed -n 's/.* \([0-9]\+\)\.\([0-9]\+\)\..*/\2/p')
  	OLDIFS=$IFS
  	IFS=$(printf '\n\t')
  	gitignores=$(for file in $(git ls-files); do