vcsh: Fix condition in clone()

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index e339cde862e8d7e63776368a2c02f0099a0bc01b..98dd71ee462f7fd5fe9fac8e4cad09766be20a94 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -159,7 +159,12 @@ clone() {
   You should add files to your new repository."
                exit
        fi
   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" ] &&
        hook pre-merge
        git ls-tree -r --name-only origin/"$VCSH_BRANCH" | (while read object; do
                [ -e "$object" ] &&


@@ -169,7 +174,7 @@ clone() {
        [ x"$VCSH_CONFLICT" = x'1' ]) &&
                fatal "will stop after fetching and not try to merge!
   Once this situation has been resolved, run 'vcsh $VCSH_REPO_NAME pull' to finish cloning." 17
        [ x"$VCSH_CONFLICT" = x'1' ]) &&
                fatal "will stop after fetching and not try to merge!
   Once this situation has been resolved, run 'vcsh $VCSH_REPO_NAME pull' to finish cloning." 17

-       git merge origin/"$VCSH_BRANCH"
+       git -c merge.ff=true merge origin/"$VCSH_BRANCH"

        hook post-merge
        hook post-clone
        retire
        hook post-merge
        hook post-clone
        retire


@@ -264,7 +269,7 @@ list_tracked_helper() {
 }
 
 list_tracked_by() {
 }
 
 list_tracked_by() {

-       list_tracked $2
+       list_tracked '' $2

 }
 
 list_untracked() {
 }
 
 list_untracked() {