diff --git a/changelog b/changelog index a3c51ba2709d385bc9ba7f37b2eb12066722f18f..2a87fc958545019ed66e7e317d3199a75ba42845 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,10 @@ +2013-03-31 Richard Hartmann <richih.mailinglist@gmail.com> + + * Release 1.1 + * Documentation fixes + * Use rm -f when removing a git repo + * Fix quoting bug (Debian #699093) + 2013-02-13 Richard Hartmann <richih.mailinglist@gmail.com> * Release 1.0.1 diff --git a/vcsh b/vcsh index 4fb1c4571120dc83c926aa9d47e1f7d7d8e0921f..f222fff8abf02f08905180a4d63b0020415969ec 100755 --- a/vcsh +++ b/vcsh @@ -138,7 +138,7 @@ clone() { delete() { cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11 use - info "This operation WILL DETROY DATA!" + info "This operation WILL DESTROY DATA!" files=$(git ls-files) echo "These files will be deleted: @@ -151,7 +151,7 @@ To continue, type 'Yes, do as I say'" for file in $files; do rm -f $file || info "could not delete '$file', continuing with deletion" done - rm -r "$GIT_DIR" || error "could not delete '$GIT_DIR'" + rm -rf "$GIT_DIR" || error "could not delete '$GIT_DIR'" } enter() { @@ -214,7 +214,7 @@ rename() { run() { hook pre-run use - $VCSH_EXTERNAL_COMMAND + "$@" hook post-run } @@ -304,7 +304,7 @@ elif [ "$1" = 'delete' ] || export VCSH_REPO_NAME="$2" export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git" [ "$VCSH_COMMAND" = 'rename' ] && export GIT_DIR_NEW="$VCSH_REPO_D/$3.git" - [ "$VCSH_COMMAND" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$*" + [ "$VCSH_COMMAND" = 'run' ] && shift 2 [ "$VCSH_COMMAND" = 'write-gitignore' ] elif [ "$1" = 'list' ] || [ "$1" = 'list-tracked' ]; then @@ -315,7 +315,7 @@ elif [ -n "$2" ]; then export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git" [ -d $GIT_DIR ] || { help; exit 1; } shift 1 - export VCSH_EXTERNAL_COMMAND="git $*" + set -- "git" "$@" elif [ -n "$1" ]; then export VCSH_COMMAND='enter' export VCSH_REPO_NAME="$1" @@ -349,6 +349,6 @@ done verbose "$VCSH_COMMAND begin" export VCSH_COMMAND=$(echo $VCSH_COMMAND | sed 's/-/_/g') hook pre-command -$VCSH_COMMAND +$VCSH_COMMAND "$@" hook post-command verbose "$VCSH_COMMAND end, exiting"