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

Merge branch 'feature--overlay_functions'
authorRichard Hartmann <richih@debian.org>
Thu, 23 Oct 2014 18:17:04 +0000 (20:17 +0200)
committerRichard Hartmann <richih@debian.org>
Thu, 23 Oct 2014 18:17:04 +0000 (20:17 +0200)
1  2 
vcsh

diff --combined vcsh
index a12bc4962f9f8b31cc14b03fe3739d9213e4606f,301151a1d6d83ca10e678957300819ff50de5c3d..53ce905c3a7c62abfbbfcb71e89c38b3b143bc1b
--- 1/vcsh
--- 2/vcsh
+++ b/vcsh
@@@ -24,7 -24,6 +24,7 @@@ SELF=$(basename $0
  
  fatal() {
        echo "$SELF: fatal: $1" >&2
 +      [ -z $2] && exit 1
        exit $2
  }
  
@@@ -76,6 -75,7 +76,7 @@@ f
  # Read defaults
  : ${VCSH_REPO_D:="$XDG_CONFIG_HOME/vcsh/repo.d"}
  : ${VCSH_HOOK_D:="$XDG_CONFIG_HOME/vcsh/hooks-enabled"}
+ : ${VCSH_OVERLAY_D:="$XDG_CONFIG_HOME/vcsh/overlays-enabled"}
  : ${VCSH_BASE:="$HOME"}
  : ${VCSH_GITIGNORE:=exact}
  : ${VCSH_GITATTRIBUTES:=none}
@@@ -149,10 -149,9 +150,10 @@@ clone() 
        git remote add origin "$GIT_REMOTE"
        git config branch.master.remote origin
        git config branch.master.merge  refs/heads/master
 -      if [ $(git ls-remote origin master 2> /dev/null | wc -l ) -lt 1 ]; then
 -              info "remote is empty, not merging anything"
 -              exit
 +      VCSH_CLONE_ERROR=$(git ls-remote origin master 2>&1)
 +      if [ -n "$VCSH_CLONE_ERROR" ]; then
 +              rm -rf "$GIT_DIR"
 +              fatal "$VCSH_CLONE_ERROR" 1
        fi
        git fetch
        hook pre-merge
@@@ -513,6 -512,14 +514,14 @@@ check_dir "$VCSH_REPO_D
  
  verbose "$VCSH_COMMAND begin"
  VCSH_COMMAND=$(echo "$VCSH_COMMAND" | sed 's/-/_/g'); export VCSH_COMMAND
+ # source overlay functions
+ for overlay in "$VCSH_OVERLAY_D/$VCSH_COMMAND"* "$VCSH_OVERLAY_D/$VCSH_REPO_NAME.$VCSH_COMMAND"*; do
+       [ -r "$overlay" ] || continue
+       info "sourcing '$overlay'"
+       . "$overlay"
+ done
  hook pre-command
  $VCSH_COMMAND "$@"
  hook post-command