From: Richard Hartmann Date: Wed, 5 Mar 2014 17:06:04 +0000 (+0100) Subject: Merge branch 'feature/gitattributes' X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/e1bb725d9adb0f1814bb5a8969a67feda631ea8b?ds=inline;hp=--cc Merge branch 'feature/gitattributes' Conflicts: vcsh --- e1bb725d9adb0f1814bb5a8969a67feda631ea8b diff --cc vcsh index 029a2b2,fcb3aa4..4761a53 --- a/vcsh +++ b/vcsh @@@ -74,9 -74,10 +74,10 @@@ f # Read defaults : ${VCSH_REPO_D:=$XDG_CONFIG_HOME/vcsh/repo.d} -: ${VCSH_HOOK_D:=$XDH_CONFIG_HOME/vcsh/hooks-enabled} +: ${VCSH_HOOK_D:=$XDG_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,8 -335,8 +335,8 @@@ 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' + git config vcsh.vcsh 'true' use [ -e "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" [ -e "$VCSH_BASE/.gitattributes.d/$VCSH_REPO_NAME" ] && git add -f "$VCSH_BASE/.gitattributes.d/$VCSH_REPO_NAME"