Merge branch 'master' of github.com:RichiH/vcsh

diff --combined vcsh
index 1fc78e2383ca522e62e9b82a381ab42803fb6ae8,d6ee234a2ebd26e4ca10360f44701f304eefb1e4..cf0c8cf1d3dacfcf69cc6a0a95c050527881a419
--- 1/vcsh
--- 2/vcsh
+++ b/vcsh
@@@ -365,7 -365,11 +365,11 @@@ write_gitignore() 
                        file="$new"
                done;
        done | sort -u)
-       tempfile=$(mktemp) || fatal "could not create tempfile" 51
+ 
+       # Contrary to GNU mktemp, mktemp on BSD/OSX requires a template for temp files
+       # Use the template GNU mktemo defaults to
+       tempfile=$(mktemp tmp.XXXXXXXXXX) || fatal "could not create tempfile" 51
+ 
        echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57
        for gitignore in $gitignores; do
                echo "$gitignore" | sed 's@^@!/@' >> "$tempfile" || fatal "could not write to '$tempfile'" 57
@@@ -395,7 -399,6 +399,7 @@@ if [ "$1" = 'clone' ]; the
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
  elif [ "$1" = 'version' ]; then
        echo "$SELF $VERSION"
 +      git version
        exit
  elif [ "$1" = 'which' ]; then
        [ -z "$2" ] && fatal "$1: please specify a filename" 1