From: Richard Hartmann Date: Wed, 30 Nov 2011 02:44:14 +0000 (+0100) Subject: Merge branch 'master' of github.com:RichiH/vcsh X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/881deb41fb7c5af8c5feedd075c780f3ce94df99?ds=inline;hp=-c Merge branch 'master' of github.com:RichiH/vcsh Conflicts: vcsh --- 881deb41fb7c5af8c5feedd075c780f3ce94df99 diff --combined doc/vcsh.1.ronn index e06c5f9,26615f6..0ea9428 --- a/doc/vcsh.1.ronn +++ b/doc/vcsh.1.ronn @@@ -3,7 -3,7 +3,7 @@@ vcsh(1) - manage and sync config files ## SYNOPSIS - `vcsh` clone [] + `vcsh` clone [] `vcsh` delete @@@ -44,6 -44,10 +44,10 @@@ vcsh. That being said, you can easily u A sample configuration for `vcsh` and `mr` can be found at *https://github.com/RichiH/vcsh_mr_template* + Please note that you can always use a path instead of a name for . + This is needed to support mr and other scripts properly and of no concern to + an interactive user. + ## OPTIONS * clone: @@@ -71,13 -75,6 +75,13 @@@ Run command with <$GIT_DIR> and <$GIT_WORK_TREE> set. Allows you to run any and all commands without any restrictions. Use with care. + Please note that there is a somewhat magic feature for run. Instead of + it accepts , as well. Anything that has a slash in it will be assumed to + be a path. `vcsh run` will then operate on this directory instead of the one + normally generated from the repository's name. + This is needed to support mr and other scripts properly and of no concern to + an interactive user. + * seed-gitignore: Seed .gitignore.d/ from git ls-files. diff --combined vcsh index 665c61a,550c36f..8ca079a --- a/vcsh +++ b/vcsh @@@ -1,6 -1,6 +1,6 @@@ #!/bin/sh -[ -n "$VCSH_DEBUG" ] && set -x +[ -n "$VCSH_DEBUG" ] && set -vx [ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config" [ -z "$VCSH_BASE" ] && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d" @@@ -168,7 -168,8 +168,7 @@@ setup() git config core.worktree "$GIT_WORK_TREE" git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME" git config vcsh.vcsh 'true' - touch "$HOME/.gitignore.d/$VCSH_REPO_NAME" || error "could not touch '$HOME/.gitignore.d/$VCSH_REPO_NAME'" - git add "$HOME/.gitignore.d/$VCSH_REPO_NAME" + [ -e "$HOME/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$HOME/.gitignore.d/$VCSH_REPO_NAME" } use() { @@@ -199,16 -200,9 +199,8 @@@ elif [ "$1" = 'delete' ] | export VCSH_REPO_NAME="$2" export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git" [ "$VCSH_COMMAND" = 'rename' ] && export GIT_DIR_NEW="$VCSH_BASE/$3.git" - if [ "$VCSH_COMMAND" = 'run' ]; then - shift 2 - export VCSH_EXTERNAL_COMMAND="$*" - # Did we receive a directory instead of a name? Mangle the input to fit normal operation! - if echo $VCSH_REPO_NAME | grep -q '/'; then - export GIT_DIR=$VCSH_REPO_NAME - export VCSH_REPO_NAME=$(basename $VCSH_REPO_NAME .git) - fi - fi + [ "$VCSH_COMMAND" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$*" [ "$VCSH_COMMAND" = 'seed-gitignore' ] -# [ "$VCSH_COMMAND" = 'seed-gitignore' ] && export VCSH_COMMAND='seed_gitignore' elif [ "$1" = 'list' ]; then export VCSH_COMMAND="$1" elif [ -n "$1" ]; then @@@ -223,6 -217,14 +215,14 @@@ els help && exit fi + # Did we receive a directory instead of a name? + # Mangle the input to fit normal operation. + if echo $VCSH_REPO_NAME | grep -q '/'; then + export GIT_DIR=$VCSH_REPO_NAME + export VCSH_REPO_NAME=$(basename $VCSH_REPO_NAME .git) + fi + + for check_directory in "$VCSH_BASE" "$HOME/.gitignore.d" do if [ ! -d "$check_directory" ]; then