From: Richard Hartmann <richih@debian.org>
Date: Mon, 2 Sep 2013 22:57:24 +0000 (+0200)
Subject: vcsh: Move up gitignore check
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/e727c2f4a9dbda7358ad4148fc2263fc6431a7c4?ds=sidebyside

vcsh: Move up gitignore check
---

diff --git a/vcsh b/vcsh
index d1283e4..1de5ed7 100755
--- a/vcsh
+++ b/vcsh
@@ -83,6 +83,10 @@ fi
 [ -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
@@ -382,10 +386,6 @@ write_gitignore() {
 		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"