vcsh: Make `vcsh version` print vcsh and git version information

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index d1283e4e3e8bc3bc9bbf9ba4962ca8ec4fd5ee81..1fc78e2383ca522e62e9b82a381ab42803fb6ae8 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -24,7 +24,7 @@ basename() {
 }
 
 SELF=$(basename $0)
 }
 
 SELF=$(basename $0)

-VERSION='1.20130829'
+VERSION='1.20130909'

 
 fatal() {
        echo "$SELF: fatal: $1" >&2
 
 fatal() {
        echo "$SELF: fatal: $1" >&2


@@ -83,6 +83,10 @@ fi
 [ -z "$VCSH_GITIGNORE" ]              && VCSH_GITIGNORE='exact'
 [ -z "$VCSH_WORKTREE" ]               && VCSH_WORKTREE='absolute'
 
 [ -z "$VCSH_GITIGNORE" ]              && VCSH_GITIGNORE='exact'
 [ -z "$VCSH_WORKTREE" ]               && VCSH_WORKTREE='absolute'
 

+if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive' ]; then
+       fatal "'\$VCSH_GITIGNORE' must equal 'exact', 'none', or 'recursive'" 1
+fi
+

 if [ ! "x$VCSH_WORKTREE" = 'xabsolute' ] && [ ! "x$VCSH_WORKTREE" = 'xrelative' ]; then
        fatal "'\$VCSH_WORKTREE' must equal 'absolute', or 'relative'" 1
 fi
 if [ ! "x$VCSH_WORKTREE" = 'xabsolute' ] && [ ! "x$VCSH_WORKTREE" = 'xrelative' ]; then
        fatal "'\$VCSH_WORKTREE' must equal 'absolute', or 'relative'" 1
 fi


@@ -382,10 +386,6 @@ write_gitignore() {
                fatal "could not move '$tempfile' to '$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME'" 53
 }
 
                fatal "could not move '$tempfile' to '$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME'" 53
 }
 

-if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive' ]; then
-       fatal "'\$VCSH_GITIGNORE' must equal 'exact', 'none', or 'recursive'" 1
-fi
-

 if [ "$1" = 'clone' ]; then
        [ -z "$2" ] && fatal "$1: please specify a remote" 1
        export VCSH_COMMAND="$1"
 if [ "$1" = 'clone' ]; then
        [ -z "$2" ] && fatal "$1: please specify a remote" 1
        export VCSH_COMMAND="$1"


@@ -395,6 +395,7 @@ if [ "$1" = 'clone' ]; then
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
 elif [ "$1" = 'version' ]; then
        echo "$SELF $VERSION"
        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
        exit
 elif [ "$1" = 'which' ]; then
        [ -z "$2" ] && fatal "$1: please specify a filename" 1