Merge pull request #262 from soulofmischief/patch-2

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 18faf4c16dd6bfef4b97eb86029e5ea83f9134c2..d1d26eddcc44809ae3cfa82c448e68bc23c2082d 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -22,6 +22,9 @@
 VERSION='1.20141026'
 SELF=$(basename $0)
 
+# Ensure all files created are accessible only to the current user.
+umask 0077
+
 fatal() {
        echo "$SELF: fatal: $1" >&2
        [ -z $2 ] && exit 1
@@ -106,6 +109,9 @@ help() {
    commit               Commit in all repositories
    delete <repo>        Delete an existing repository
    enter <repo>         Enter repository; spawn new instance of \$SHELL
+                        with \$GIT_DIR set.
+   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 +166,12 @@ clone() {
   You should add files to your new repository."
                exit
        fi
-       git fetch origin "$VCSH_BRANCH"
+       GIT_VERSION_MAJOR=$(git --version | sed -E -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" ] &&
@@ -179,11 +190,12 @@ clone() {
 
 commit() {
        hook pre-commit
+        shift  # remove the "commit" command.
        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 commit --untracked-files=no --quiet
+               git commit --untracked-files=no --quiet "$@"
                VCSH_COMMAND_RETURN_CODE=$?
                echo
        done
@@ -218,11 +230,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
 }
@@ -244,7 +266,7 @@ init() {
        [ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
        mkdir -p "$VCSH_BASE" || fatal "could not create '$VCSH_BASE'" 50
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
-       git init --shared=0600
+       git init --shared=false
        upgrade
        hook post-init
 }
@@ -257,7 +279,7 @@ list() {
 
 get_files() {
        GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
-       git ls-files
+       git ls-files --full-name
 }
 
 list_tracked() {
@@ -459,14 +481,21 @@ write_gitignore() {
 
        use
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
+       local GIT_VERSION="$(git --version)"
+       local GIT_VERSION_MAJOR=$(echo $GIT_VERSION | sed -E -n 's/.* ([0-9]+)\..*/\1/p')
+       local GIT_VERSION_MINOR=$(echo $GIT_VERSION | sed -E -n 's/.* ([0-9]+)\.([0-9]+)\..*/\2/p')
        OLDIFS=$IFS
        IFS=$(printf '\n\t')
        gitignores=$(for file in $(git ls-files); do
-               while true; do
-                       echo "$file"; new=${file%/*}
-                       [ x"$file" = x"$new" ] && break
-                       file=$new
-               done;
+               if [ $GIT_VERSION_MAJOR -ge 2 -a $GIT_VERSION_MINOR -ge 7 ]; then
+                       echo "$file";
+               else
+                       while true; do
+                               echo "$file"; new=${file%/*}
+                               [ x"$file" = x"$new" ] && break
+                               file=$new
+                       done;
+               fi
        done | sort -u)
 
        # Contrary to GNU mktemp, mktemp on BSD/OSX requires a template for temp files