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

Update `vcsh delete`
authorRichard Hartmann <richih.mailinglist@gmail.com>
Sun, 20 Nov 2011 10:35:18 +0000 (11:35 +0100)
committerRichard Hartmann <richih.mailinglist@gmail.com>
Sun, 20 Nov 2011 10:35:18 +0000 (11:35 +0100)
* Be less aggressive when asking for confirmation
* Work independently from $PWD

vcsh

diff --git a/vcsh b/vcsh
index 23f8453150bc8ac28451fbcf6b0662e4e37033de..25f52f844099e382e42310dda2d8694c30228b50 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -215,11 +215,10 @@ elif [ "$1" = 'delete' ]; then
        verbose "delete begin"
        REPO_NAME=$2
        [ -z $REPO_NAME ] && help && echo && echo "$SELF $1: error: please specify repository to work on" && return 0
        verbose "delete begin"
        REPO_NAME=$2
        [ -z $REPO_NAME ] && help && echo && echo "$SELF $1: error: please specify repository to work on" && return 0
+       old_dir="$PWD"
+       cd "$HOME"
        use $REPO_NAME || return 1
        echo "$SELF: info: This operation WILL DETROY DATA!"
        use $REPO_NAME || return 1
        echo "$SELF: info: This operation WILL DETROY DATA!"
-       echo -n "Continue? Anything other than 'y' will abort. "
-       read answer
-       [ x$answer = x"y" ] || exit
        files=$(git ls-files)
        echo "These files would be deleted:
 
        files=$(git ls-files)
        echo "These files would be deleted:
 
@@ -233,6 +232,7 @@ To continue, type \"Yes, do as I say\""
                rm -f $file || echo "$SELF: info: could not delete '$file', continuing with deletion"
        done
        rm -rf "$VCSH_BASE/$REPO_NAME.git" || echo "$SELF: info: could not delete '$VCSH_BASE/$REPO_NAME.git'"
                rm -f $file || echo "$SELF: info: could not delete '$file', continuing with deletion"
        done
        rm -rf "$VCSH_BASE/$REPO_NAME.git" || echo "$SELF: info: could not delete '$VCSH_BASE/$REPO_NAME.git'"
+       cd "$old_dir"
        verbose "delete end"
 
 
        verbose "delete end"