X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/c3c88c981d7e4d5cafcd69137d76de64b0236ace..fcd9f1bdee4ace55ecc7822b046ae12ad859c90d:/vcsh diff --git a/vcsh b/vcsh index 18cd9e5..a12bc49 100755 --- a/vcsh +++ b/vcsh @@ -19,11 +19,12 @@ # If '.git-HEAD' is appended to the version, you are seeing an unreleased # version of vcsh; the master branch is supposed to be clean at all times # so you can most likely just use it nonetheless -VERSION='1.20140313' +VERSION='1.20141009' SELF=$(basename $0) fatal() { echo "$SELF: fatal: $1" >&2 + [ -z $2] && exit 1 exit $2 } @@ -148,9 +149,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 @@ -161,7 +163,7 @@ clone() { done [ x"$VCSH_CONFLICT" = x'1' ]) && fatal "will stop after fetching and not try to merge! - Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning." 17 + Once this situation has been resolved, run 'vcsh $VCSH_REPO_NAME pull' to finish cloning." 17 git merge origin/master hook post-merge hook post-clone @@ -244,18 +246,20 @@ get_files() { list_tracked() { for VCSH_REPO_NAME in $(list); do get_files - done | sort -u + done | sed "s,^,$(printf '%s\n' "$VCSH_BASE/" | \ + sed 's/[,\&]/\\&/g')," | sort -u } list_tracked_by() { use - git ls-files | sort -u + git ls-files | sed "s,^,$(printf '%s\n' "$VCSH_BASE/" | \ + sed 's/[,\&]/\\&/g')," | sort -u } pull() { hook pre-pull for VCSH_REPO_NAME in $(list); do - printf "$VCSH_REPO_NAME: " + printf '%s: ' "$VCSH_REPO_NAME" GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR use git pull @@ -268,7 +272,7 @@ pull() { push() { hook pre-push for VCSH_REPO_NAME in $(list); do - printf "$VCSH_REPO_NAME: " + printf '%s: ' "$VCSH_REPO_NAME" GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR use git push @@ -349,6 +353,7 @@ use() { } which() { + [ -e "$VCSH_COMMAND_PARAMETER" ] || fatal "'$VCSH_COMMAND_PARAMETER' does not exist" 1 for VCSH_REPO_NAME in $(list); do for VCSH_FILE in $(get_files); do echo "$VCSH_FILE" | grep -q "$VCSH_COMMAND_PARAMETER" && echo "$VCSH_REPO_NAME: $VCSH_FILE"