X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-clone-script;h=f988b8c9c79fbb9ec9c3cad556cb4c9d51984475;hb=89bc8c785e20258efba3b2b5ffc26098fa0b8bc8;hp=a808c02f17160b6c72212ec02cff05a687f65d35;hpb=1cadb5a2719eef7dc4e707ee2f796c94661f4622;p=git.git diff --git a/git-clone-script b/git-clone-script index a808c02f..f988b8c9 100755 --- a/git-clone-script +++ b/git-clone-script @@ -6,7 +6,7 @@ # Clone a repository into a different directory that does not yet exist. usage() { - echo >&2 "* git clone [-l] [-q] [-u ] " + echo >&2 "* git clone [-l [-s]] [-q] [-u ] " exit 1 } @@ -16,11 +16,14 @@ get_repo_base() { quiet= use_local=no +local_shared=no upload_pack= while case "$#,$1" in 0,*) break ;; *,-l|*,--l|*,--lo|*,--loc|*,--loca|*,--local) use_local=yes ;; + *,-s|*,--s|*,--sh|*,--sha|*,--shar|*,--share|*,--shared) + local_shared=yes ;; *,-q|*,--quiet) quiet=-q ;; 1,-u|1,--upload-pack) usage ;; *,-u|*,--upload-pack) @@ -57,22 +60,34 @@ yes,yes) exit 1 } - # See if we can hardlink and drop "l" if not. - sample_file=$(cd "$repo" && \ - find objects -type f -print | sed -e 1q) + case "$local_shared" in + no) + # See if we can hardlink and drop "l" if not. + sample_file=$(cd "$repo" && \ + find objects -type f -print | sed -e 1q) - # objects directory should not be empty since we are cloning! - test -f "$repo/$sample_file" || exit + # objects directory should not be empty since we are cloning! + test -f "$repo/$sample_file" || exit - l= - if ln "$repo/$sample_file" "$D/.git/objects/sample" 2>/dev/null - then - l=l - fi && - rm -f "$D/.git/objects/sample" && - cd "$repo" && - find objects -type f -print | - cpio -puamd$l "$D/.git/" || exit 1 + l= + if ln "$repo/$sample_file" "$D/.git/objects/sample" 2>/dev/null + then + l=l + fi && + rm -f "$D/.git/objects/sample" && + cd "$repo" && + find objects -type f -print | + cpio -puamd$l "$D/.git/" || exit 1 + ;; + yes) + mkdir -p "$D/.git/objects/info" + { + test -f "$repo/objects/info/alternates" && + cat "$repo/objects/info/alternates"; + echo "$repo/objects" + } >"$D/.git/objects/info/alternates" + ;; + esac # Make a duplicate of refs and HEAD pointer HEAD= @@ -89,8 +104,17 @@ yes,yes) rsync $quiet -avz --ignore-existing "$repo/refs/" "$D/.git/refs/" ;; http://*) - echo "Somebody should add http fetch" >&2 - exit 1 + git-clone-dumb-http "$repo" "$D" + case "$?" in + 2) + echo "Somebody should define smarter http server protocol" >&2 + exit 1 + ;; + 0) + ;; + *) + exit + esac ;; *) cd "$D" && case "$upload_pack" in @@ -103,6 +127,8 @@ yes,yes) esac # Update origin. -mkdir -p "$D/.git/branches/" && -rm -f "$D/.git/branches/origin" && -echo "$repo" >"$D/.git/branches/origin" +mkdir -p "$D/.git/remotes/" && +rm -f "$D/.git/remotes/origin" && +echo >"$D/.git/remotes/origin" \ +"URL: $repo +Pull: master:origin"