Handle the French locale in reproducible builds slightly less hamfistedly

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 18faf4c16dd6bfef4b97eb86029e5ea83f9134c2..98e0acd3cd3356626e672035a4ebc2d5258168ba 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -106,6 +106,8 @@ help() {
    commit               Commit in all repositories
    delete <repo>        Delete an existing repository
    enter <repo>         Enter repository; spawn new instance of \$SHELL
+   foreach [<-g>]
+     <git command>      Execute a command for every repository
    help                 Display this help text
    init <repo>          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" ] &&
@@ -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
 }