From: Richard Hartmann <richih@debian.org>
Date: Fri, 21 Feb 2014 22:41:29 +0000 (+0100)
Subject: Merge branch 'feature/gitattributes'
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/a7ec1feb5aaa690f1360f8c4f91d670bb3787752?ds=inline;hp=-c

Merge branch 'feature/gitattributes'

Conflicts:
	vcsh
---

a7ec1feb5aaa690f1360f8c4f91d670bb3787752
diff --combined vcsh
index 18b9380,a6653fc..418f78a
--- a/vcsh
+++ b/vcsh
@@@ -74,7 -74,7 +74,7 @@@ 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_WORKTREE:=absolute}
@@@ -334,9 -334,11 +334,11 @@@ 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"
 -	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"
  	hook post-upgrade
  }
  
@@@ -498,6 -500,7 +500,7 @@@ check_dir() 
  
  check_dir "$VCSH_REPO_D"
  [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && check_dir "$VCSH_BASE/.gitignore.d"
+ check_dir "$VCSH_BASE/.gitattributes.d"
  
  verbose "$VCSH_COMMAND begin"
  export VCSH_COMMAND=$(echo $VCSH_COMMAND | sed 's/-/_/g')