Merge branch 'jc/status'
[gitweb.git] / git-clone.sh
index c0762922751a8f906116e74fd8a2c2ce19194b2b..47f3ec9761ba3e681e3035e6ae1c7449a6177a5e 100755 (executable)
@@ -5,8 +5,11 @@
 # 
 # Clone a repository into a different directory that does not yet exist.
 
+# See git-sh-setup why.
+unset CDPATH
+
 usage() {
-       echo >&2 "* git clone [-l [-s]] [-q] [-u <upload-pack>] <repo> <dir>"
+       echo >&2 "Usage: $0 [--bare] [-l [-s]] [-q] [-u <upload-pack>] [-o <name>] [-n] <repo> [<dir>]"
        exit 1
 }
 
@@ -20,7 +23,7 @@ fi
 
 http_fetch () {
        # $1 = Remote, $2 = Local
-       curl -nsf $curl_extra_args "$1" >"$2"
+       curl -nsfL $curl_extra_args "$1" >"$2"
 }
 
 clone_dumb_http () {
@@ -28,29 +31,19 @@ clone_dumb_http () {
        cd "$2" &&
        clone_tmp='.git/clone-tmp' &&
        mkdir -p "$clone_tmp" || exit 1
-       http_fetch "$1/info/refs" "$clone_tmp/refs" &&
-       http_fetch "$1/objects/info/packs" "$clone_tmp/packs" || {
+       http_fetch "$1/info/refs" "$clone_tmp/refs" || {
                echo >&2 "Cannot get remote repository information.
 Perhaps git-update-server-info needs to be run there?"
                exit 1;
        }
-       while read type name
-       do
-               case "$type" in
-               P) ;;
-               *) continue ;;
-               esac &&
-
-               idx=`expr "$name" : '\(.*\)\.pack'`.idx
-               http_fetch "$1/objects/pack/$name" ".git/objects/pack/$name" &&
-               http_fetch "$1/objects/pack/$idx" ".git/objects/pack/$idx" &&
-               git-verify-pack ".git/objects/pack/$idx" || exit 1
-       done <"$clone_tmp/packs"
-
        while read sha1 refname
        do
                name=`expr "$refname" : 'refs/\(.*\)'` &&
-               git-http-fetch -v -a -w "$name" "$name" "$1/" || exit 1
+               case "$name" in
+               *^*)    ;;
+               *)
+                       git-http-fetch -v -a -w "$name" "$name" "$1/" || exit 1
+               esac
        done <"$clone_tmp/refs"
        rm -fr "$clone_tmp"
 }
@@ -58,14 +51,36 @@ Perhaps git-update-server-info needs to be run there?"
 quiet=
 use_local=no
 local_shared=no
+no_checkout=
 upload_pack=
+bare=
+origin=origin
+origin_override=
 while
        case "$#,$1" in
        0,*) break ;;
+       *,-n|*,--no|*,--no-|*,--no-c|*,--no-ch|*,--no-che|*,--no-chec|\
+       *,--no-check|*,--no-checko|*,--no-checkou|*,--no-checkout)
+         no_checkout=yes ;;
+       *,--na|*,--nak|*,--nake|*,--naked|\
+       *,-b|*,--b|*,--ba|*,--bar|*,--bare) bare=yes ;;
        *,-l|*,--l|*,--lo|*,--loc|*,--loca|*,--local) use_local=yes ;;
         *,-s|*,--s|*,--sh|*,--sha|*,--shar|*,--share|*,--shared) 
-          local_shared=yes ;;
+          local_shared=yes; use_local=yes ;;
        *,-q|*,--quiet) quiet=-q ;;
+       1,-o) usage;;
+       *,-o)
+               git-check-ref-format "$2" || {
+                   echo >&2 "'$2' is not suitable for a branch name"
+                   exit 1
+               }
+               test -z "$origin_override" || {
+                   echo >&2 "Do not give more than one -o options."
+                   exit 1
+               }
+               origin_override=yes
+               origin="$2"; shift
+               ;;
        1,-u|1,--upload-pack) usage ;;
        *,-u|*,--upload-pack)
                shift
@@ -77,6 +92,17 @@ do
        shift
 done
 
+# --bare implies --no-checkout
+if test yes = "$bare"
+then
+       if test yes = "$origin_override"
+       then
+               echo >&2 '--bare and -o $origin options are incompatible.'
+               exit 1
+       fi
+       no_checkout=yes
+fi
+
 # Turn the source into an absolute path if
 # it is local
 repo="$1"
@@ -87,11 +113,21 @@ if base=$(get_repo_base "$repo"); then
 fi
 
 dir="$2"
-mkdir "$dir" &&
-D=$(
-       (cd "$dir" && git-init-db && pwd)
-) &&
-test -d "$D" || usage
+# Try using "humanish" part of source repo if user didn't specify one
+[ -z "$dir" ] && dir=$(echo "$repo" | sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
+[ -e "$dir" ] && echo "$dir already exists." && usage
+mkdir -p "$dir" &&
+D=$(cd "$dir" && pwd) &&
+case "$bare" in
+yes) GIT_DIR="$D" ;;
+*) GIT_DIR="$D/.git" ;;
+esac && export GIT_DIR && git-init-db || usage
+case "$bare" in
+yes)
+       GIT_DIR="$D" ;;
+*)
+       GIT_DIR="$D/.git" ;;
+esac
 
 # We do local magic only when the user tells us to.
 case "$local,$use_local" in
@@ -111,22 +147,21 @@ yes,yes)
            test -f "$repo/$sample_file" || exit
 
            l=
-           if ln "$repo/$sample_file" "$D/.git/objects/sample" 2>/dev/null
+           if ln "$repo/$sample_file" "$GIT_DIR/objects/sample" 2>/dev/null
            then
                    l=l
            fi &&
-           rm -f "$D/.git/objects/sample" &&
+           rm -f "$GIT_DIR/objects/sample" &&
            cd "$repo" &&
-           find objects -type f -print |
-           cpio -puamd$l "$D/.git/" || exit 1
+           find objects -depth -print | cpio -puamd$l "$GIT_DIR/" || exit 1
            ;;
        yes)
-           mkdir -p "$D/.git/objects/info"
+           mkdir -p "$GIT_DIR/objects/info"
            {
                test -f "$repo/objects/info/alternates" &&
                cat "$repo/objects/info/alternates";
                echo "$repo/objects"
-           } >"$D/.git/objects/info/alternates"
+           } >"$GIT_DIR/objects/info/alternates"
            ;;
        esac
 
@@ -136,13 +171,39 @@ yes,yes)
        then
                HEAD=HEAD
        fi
-       tar Ccf "$repo" - refs $HEAD | tar Cxf "$D/.git" - || exit 1
+       (cd "$repo" && tar cf - refs $HEAD) |
+       (cd "$GIT_DIR" && tar xf -) || exit 1
        ;;
 *)
        case "$repo" in
        rsync://*)
-               rsync $quiet -avz --ignore-existing "$repo/objects/" "$D/.git/objects/" &&
-               rsync $quiet -avz --ignore-existing "$repo/refs/" "$D/.git/refs/"
+               rsync $quiet -av --ignore-existing  \
+                       --exclude info "$repo/objects/" "$GIT_DIR/objects/" &&
+               rsync $quiet -av --ignore-existing  \
+                       --exclude info "$repo/refs/" "$GIT_DIR/refs/" || exit
+
+               # Look at objects/info/alternates for rsync -- http will
+               # support it natively and git native ones will do it on the
+               # remote end.  Not having that file is not a crime.
+               rsync -q "$repo/objects/info/alternates" \
+                       "$GIT_DIR/TMP_ALT" 2>/dev/null ||
+                       rm -f "$GIT_DIR/TMP_ALT"
+               if test -f "$GIT_DIR/TMP_ALT"
+               then
+                   ( cd "$D" &&
+                     . git-parse-remote &&
+                     resolve_alternates "$repo" <"$GIT_DIR/TMP_ALT" ) |
+                   while read alt
+                   do
+                       case "$alt" in 'bad alternate: '*) die "$alt";; esac
+                       case "$quiet" in
+                       '')     echo >&2 "Getting alternate: $alt" ;;
+                       esac
+                       rsync $quiet -av --ignore-existing  \
+                           --exclude info "$alt" "$GIT_DIR/objects" || exit
+                   done
+                   rm -f "$GIT_DIR/TMP_ALT"
+               fi
                ;;
        http://*)
                clone_dumb_http "$repo" "$D"
@@ -151,15 +212,40 @@ yes,yes)
                cd "$D" && case "$upload_pack" in
                '') git-clone-pack $quiet "$repo" ;;
                *) git-clone-pack $quiet "$upload_pack" "$repo" ;;
-               esac
+               esac || {
+                       echo >&2 "clone-pack from '$repo' failed."
+                       exit 1
+               }
                ;;
        esac
        ;;
 esac
 
-# Update origin.
-mkdir -p "$D/.git/remotes/" &&
-rm -f "$D/.git/remotes/origin" &&
-echo >"$D/.git/remotes/origin" \
-"URL: $repo
-Pull: master:origin"
+cd "$D" || exit
+
+if test -f "$GIT_DIR/HEAD" && test -z "$bare"
+then
+       head_points_at=`git-symbolic-ref HEAD`
+       case "$head_points_at" in
+       refs/heads/*)
+               head_points_at=`expr "$head_points_at" : 'refs/heads/\(.*\)'`
+               mkdir -p "$GIT_DIR/remotes" &&
+               echo >"$GIT_DIR/remotes/origin" \
+               "URL: $repo
+Pull: $head_points_at:$origin" &&
+               git-update-ref "refs/heads/$origin" $(git-rev-parse HEAD) &&
+               (cd "$GIT_DIR" && find "refs/heads" -type f -print) |
+               while read ref
+               do
+                       head=`expr "$ref" : 'refs/heads/\(.*\)'` &&
+                       test "$head_points_at" = "$head" ||
+                       test "$origin" = "$head" ||
+                       echo "Pull: ${head}:${head}"
+               done >>"$GIT_DIR/remotes/origin"
+       esac
+
+       case "$no_checkout" in
+       '')
+               git checkout
+       esac
+fi