From: Richard Hartmann Date: Tue, 4 Mar 2014 19:32:22 +0000 (+0100) Subject: vcsh: Default to not using ~/.gitattributes.d X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/c2802e6be31b38797a1e8a96a7653adfa5948fc0?ds=inline;hp=-c vcsh: Default to not using ~/.gitattributes.d github: fixes richih/vcsh#111 --- c2802e6be31b38797a1e8a96a7653adfa5948fc0 diff --git a/vcsh b/vcsh index a6653fc..fcb3aa4 100755 --- a/vcsh +++ b/vcsh @@ -77,6 +77,7 @@ fi : ${VCSH_HOOK_D:=$XDH_CONFIG_HOME/vcsh/hooks-enabled} : ${VCSH_BASE:=$HOME} : ${VCSH_GITIGNORE:=exact} +: ${VCSH_GITATTRIBUTES:=none} : ${VCSH_WORKTREE:=absolute} if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive' ]; then @@ -334,7 +335,7 @@ upgrade() { git config core.worktree "$VCSH_BASE" fi [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME" - git config core.attributesfile ".gitattributes.d/$VCSH_REPO_NAME" + [ ! "x$VCSH_GITATTRIBUTES" = 'xnone' ] && git config core.attributesfile ".gitattributes.d/$VCSH_REPO_NAME" git config vcsh.vcsh 'true' use [ -e "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" @@ -500,7 +501,7 @@ check_dir() { check_dir "$VCSH_REPO_D" [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && check_dir "$VCSH_BASE/.gitignore.d" -check_dir "$VCSH_BASE/.gitattributes.d" +[ ! "x$VCSH_GITATTRIBUTES" = 'xnone' ] && check_dir "$VCSH_BASE/.gitattributes.d" verbose "$VCSH_COMMAND begin" export VCSH_COMMAND=$(echo $VCSH_COMMAND | sed 's/-/_/g')