Introduce trivial new pager.c helper infrastructure
[gitweb.git] / git-clone.sh
index c09979a7a49e36b35e333b902cb0e0d689b693f4..4ed861d576bfaefa768f811a59d2ec53d233b5df 100755 (executable)
@@ -9,7 +9,7 @@
 unset CDPATH
 
 usage() {
-       echo >&2 "* git clone [-l [-s]] [-q] [-u <upload-pack>] [-n] <repo> [<dir>]"
+       echo >&2 "Usage: $0 [--bare] [-l [-s]] [-q] [-u <upload-pack>] [-o <name>] [-n] <repo> [<dir>]"
        exit 1
 }
 
@@ -31,25 +31,11 @@ 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/\(.*\)'` &&
@@ -67,14 +53,34 @@ use_local=no
 local_shared=no
 no_checkout=
 upload_pack=
+bare=
+origin=origin
+origin_override=
 while
        case "$#,$1" in
        0,*) break ;;
-       *,-n) no_checkout=yes ;;
+       *,-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
@@ -86,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"
@@ -97,13 +114,21 @@ fi
 
 dir="$2"
 # 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')
+[ -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" && git-init-db && pwd)
-) &&
-test -d "$D" || usage
+D=$(cd "$dir" && pwd) &&
+trap 'err=$?; cd ..; rm -r "$D"; exit $err' exit
+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
@@ -123,21 +148,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 -depth -print | cpio -puamd$l "$D/.git/" || exit 1
+           find objects -depth -print | cpio -pumd$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
 
@@ -148,27 +173,27 @@ yes,yes)
                HEAD=HEAD
        fi
        (cd "$repo" && tar cf - refs $HEAD) |
-       (cd "$D/.git" && tar xf -) || exit 1
+       (cd "$GIT_DIR" && tar xf -) || exit 1
        ;;
 *)
        case "$repo" in
        rsync://*)
                rsync $quiet -av --ignore-existing  \
-                       --exclude info "$repo/objects/" "$D/.git/objects/" &&
+                       --exclude info "$repo/objects/" "$GIT_DIR/objects/" &&
                rsync $quiet -av --ignore-existing  \
-                       --exclude info "$repo/refs/" "$D/.git/refs/" || exit
+                       --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" \
-                       "$D/.git/TMP_ALT" 2>/dev/null ||
-                       rm -f "$D/.git/TMP_ALT"
-               if test -f "$D/.git/TMP_ALT"
+                       "$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/TMP_ALT" ) |
+                     resolve_alternates "$repo" <"$GIT_DIR/TMP_ALT" ) |
                    while read alt
                    do
                        case "$alt" in 'bad alternate: '*) die "$alt";; esac
@@ -176,19 +201,28 @@ yes,yes)
                        '')     echo >&2 "Getting alternate: $alt" ;;
                        esac
                        rsync $quiet -av --ignore-existing  \
-                           --exclude info "$alt" "$D/.git/objects" || exit
+                           --exclude info "$alt" "$GIT_DIR/objects" || exit
                    done
-                   rm -f "$D/.git/TMP_ALT"
+                   rm -f "$GIT_DIR/TMP_ALT"
                fi
                ;;
        http://*)
-               clone_dumb_http "$repo" "$D"
+               if test -z "@@NO_CURL@@"
+               then
+                       clone_dumb_http "$repo" "$D"
+               else
+                       echo >&2 "http transport not supported, rebuild Git with curl support"
+                       exit 1
+               fi
                ;;
        *)
                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
        ;;
@@ -196,29 +230,32 @@ esac
 
 cd "$D" || exit
 
-if test -f ".git/HEAD"
+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/remotes &&
-               echo >.git/remotes/origin \
+               mkdir -p "$GIT_DIR/remotes" &&
+               echo >"$GIT_DIR/remotes/origin" \
                "URL: $repo
-Pull: $head_points_at:origin" &&
-               cp ".git/refs/heads/$head_points_at" .git/refs/heads/origin &&
-               find .git/refs/heads -type f -print |
+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" : '.git/refs/heads/\(.*\)'` &&
+                       head=`expr "$ref" : 'refs/heads/\(.*\)'` &&
                        test "$head_points_at" = "$head" ||
-                       test "origin" = "$head" ||
+                       test "$origin" = "$head" ||
                        echo "Pull: ${head}:${head}"
-               done >>.git/remotes/origin
+               done >>"$GIT_DIR/remotes/origin"
        esac
 
        case "$no_checkout" in
        '')
-               git checkout
+               git-read-tree -m -u -v HEAD HEAD
        esac
 fi
+
+trap - exit
+