]> git.madduck.net Git - code/vcsh.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

vcsh: Move up gitignore check
authorRichard Hartmann <richih@debian.org>
Mon, 2 Sep 2013 22:57:24 +0000 (00:57 +0200)
committerRichard Hartmann <richih@debian.org>
Mon, 2 Sep 2013 22:57:24 +0000 (00:57 +0200)
vcsh

diff --git a/vcsh b/vcsh
index d1283e4e3e8bc3bc9bbf9ba4962ca8ec4fd5ee81..1de5ed77a768795406426682d97a3e10f4024600 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -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"