]> 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:

projects / code / vcsh.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa8a206 c2802e6)
Merge branch 'feature/gitattributes'
authorRichard Hartmann <richih@debian.org>
Wed, 5 Mar 2014 17:06:04 +0000 (18:06 +0100)
committerRichard Hartmann <richih@debian.org>
Wed, 5 Mar 2014 17:06:04 +0000 (18:06 +0100)
Conflicts:
vcsh

1  2 
vcsh patch | diff1 | diff2 | blob | history

diff --cc vcsh
index 029a2b26fa078220f2039030485d121de0e2a3fc,fcb3aa40dbcd035d709309c4ac7ecf9a5d5ad57b..4761a5340a6d392b8f3f8feacbf07b886a620d7c
--- 1/vcsh
--- 2/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"
version controlled RC files

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.