vcsh: `vcsh clone [-b <branch>] <remote> [<repo>]`

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 53bec40c10e63c63b6ca3f024481037c5a170035..76502f530f1817d1b64ebd0a73d3f1253fc07905 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -19,7 +19,7 @@
 # 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.20140508'
 SELF=$(basename $0)
 
 fatal() {
@@ -98,7 +98,8 @@ help() {
    -v                   Enable verbose mode
 
    commands:
-   clone <remote> \\
+   clone [-b <branch>] \\
+         <remote> \\
          [<repo>]       Clone from an existing repository
    commit               Commit in all repositories
    delete <repo>        Delete an existing repository
@@ -146,13 +147,14 @@ clone() {
        hook pre-clone
        init
        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
+       git config branch."$VCSH_BRANCH".remote origin
+       git config branch."$VCSH_BRANCH".merge  refs/heads/"$VCSH_BRANCH"
+       git checkout -b $VCSH_BRANCH
+       if [ $(git ls-remote origin "$VCSH_BRANCH" 2> /dev/null | wc -l ) -lt 1 ]; then
                info "remote is empty, not merging anything"
                exit
        fi
-       git fetch
+       git fetch origin "$VCSH_BRANCH"
        hook pre-merge
        git ls-tree -r --name-only origin/master | (while read object; do
                [ -e "$object" ] &&
@@ -161,8 +163,8 @@ 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
-       git merge origin/master
+  Once this situation has been resolved, run 'vcsh $VCSH_REPO_NAME pull' to finish cloning." 17
+       git merge origin/"$VCSH_BRANCH"
        hook post-merge
        hook post-clone
        retire
@@ -244,12 +246,14 @@ 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() {
@@ -428,6 +432,13 @@ case $VCSH_COMMAND in
 esac    
 
 if [ x"$VCSH_COMMAND" = x'clone' ]; then
+       if [ "$2" = -b ]; then
+               VCSH_BRANCH="$3"
+               shift
+               shift
+       else
+               VCSH_BRANCH=master
+       fi
        [ -z "$2" ] && fatal "$VCSH_COMMAND: please specify a remote" 1
        GIT_REMOTE="$2"
        [ -n "$3" ] && VCSH_REPO_NAME=$3 || VCSH_REPO_NAME=$(basename "${GIT_REMOTE#*:}" .git)