X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/1a142e0ce3cfb86f61fb7f97291f29081c275f58..d2617e58f540f3c4ee43149b32a233cf55371029:/vcsh?ds=inline diff --git a/vcsh b/vcsh index 18faf4c..e77ca08 100755 --- a/vcsh +++ b/vcsh @@ -106,6 +106,8 @@ help() { commit Commit in all repositories delete Delete an existing repository enter Enter repository; spawn new instance of \$SHELL + foreach [<-g>] + Execute a command for every repository help Display this help text init Initialize a new repository list List all repositories @@ -160,7 +162,12 @@ clone() { You should add files to your new repository." exit fi - git fetch origin "$VCSH_BRANCH" + GIT_VERSION_MAJOR=$(git --version | sed -n 's/.* \([0-9]\)\..*/\1/p' ) + if [ 1 -lt "$GIT_VERSION_MAJOR" ];then + git fetch origin "$VCSH_BRANCH" + else + git fetch origin + fi hook pre-merge git ls-tree -r --name-only origin/"$VCSH_BRANCH" | (while read object; do [ -e "$object" ] && @@ -183,7 +190,7 @@ commit() { echo "$VCSH_REPO_NAME: " GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR use - git commit --untracked-files=no --quiet + git commit --untracked-files=no --quiet $@ VCSH_COMMAND_RETURN_CODE=$? echo done @@ -218,11 +225,21 @@ enter() { foreach() { hook pre-foreach + + # We default to prefixing `git` to all commands passed to foreach, but + # allow running in general context with -g + command_prefix=git + while getopts "g" flag; do + if [ x"$1" = x'-g' ]; then + unset command_prefix + fi + shift 1 + done for VCSH_REPO_NAME in $(list); do echo "$VCSH_REPO_NAME:" GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR use - git "$@" + $command_prefix "$@" done hook post-foreach }