development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-30 04:01:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

revamp git-clone (take #2).

Browse source 
This builds on top of the previous one.

 * --use-separate-remote uses .git/refs/remotes/$origin/
   directory to keep track of the upstream branches.

 * The $origin above defaults to "origin" as usual, but the
   existing "-o $origin" option can be used to override it.

I am not yet convinced if we should make "$origin" the synonym to
"refs/remotes/$origin/$name" where $name is the primary branch
name of $origin upstream, nor if so how we should decide which
upstream branch is the primary one, but that is more or less
orthogonal to what the clone does here.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-03-21 00:14:13 -08:00
parent dfeff66ed9
commit 47874d6d9a
1 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
git-clone.sh
View file

@ -9,7 +9,7 @@
unset CDPATH unset CDPATH
usage() { usage() {
echo >&2 "Usage: $0 [--reference <reference-repo>] [--bare] [-l [-s]] [-q] [-u <upload-pack>] [-o <name>] [-n] <repo> [<dir>]" echo >&2 "Usage: $0 [--use-separate-remote] [--reference <reference-repo>] [--bare] [-l [-s]] [-q] [-u <upload-pack>] [-o <name>] [-n] <repo> [<dir>]"
exit 1 exit 1
} }
@ -61,8 +61,9 @@ use File::Path qw(mkpath);
use File::Basename qw(dirname); use File::Basename qw(dirname);
my $git_dir = $ARGV[0]; my $git_dir = $ARGV[0];
my $use_separate_remote = $ARGV[1]; my $use_separate_remote = $ARGV[1];
my $origin = $ARGV[2];
my $branch_top = ($use_separate_remote ? "remotes" : "heads"); my $branch_top = ($use_separate_remote ? "remotes/$origin" : "heads");
my $tag_top = "tags"; my $tag_top = "tags";
sub store { sub store {
@ -127,7 +128,12 @@ while
*,--reference=*) *,--reference=*)
reference=`expr "$1" : '--reference=\(.*\)'` ;; reference=`expr "$1" : '--reference=\(.*\)'` ;;
*,-o) *,-o)
git-check-ref-format "$2" || { case "$2" in
*/*)
echo >&2 "'$2' is not suitable for an origin name"
exit 1
esac
git-check-ref-format "heads/$2" || {
echo >&2 "'$2' is not suitable for a branch name" echo >&2 "'$2' is not suitable for a branch name"
exit 1 exit 1
} }
@ -165,14 +171,9 @@ then
no_checkout=yes no_checkout=yes
fi fi
if test -z "$origin_override$origin" if test -z "$origin"
then then
if test -n "$use_separate_remote" origin=origin
then
origin=remotes/master
else
origin=heads/origin
fi
fi fi
# Turn the source into an absolute path if # Turn the source into an absolute path if
@ -317,7 +318,7 @@ test -d "$GIT_DIR/refs/reference-tmp" && rm -fr "$GIT_DIR/refs/reference-tmp"
if test -f "$GIT_DIR/CLONE_HEAD" if test -f "$GIT_DIR/CLONE_HEAD"
then then
# Figure out where the remote HEAD points at. # Figure out where the remote HEAD points at.
perl -e "$copy_refs" "$GIT_DIR" "$use_separate_remote" perl -e "$copy_refs" "$GIT_DIR" "$use_separate_remote" "$origin"
fi fi
cd "$D" || exit cd "$D" || exit
@ -328,8 +329,18 @@ then
# Figure out which remote branch HEAD points at. # Figure out which remote branch HEAD points at.
case "$use_separate_remote" in case "$use_separate_remote" in
'') remote_top=refs/heads ;; '') remote_top=refs/heads ;;
*) remote_top=refs/remotes ;; *) remote_top="refs/remotes/$origin" ;;
esac esac
# What to use to track the remote primary branch
if test -n "$use_separate_remote"
then
origin_tracking="remotes/$origin/master"
else
origin_tracking="heads/$origin"
fi
# The name under $remote_top the remote HEAD seems to point at
head_points_at=$( head_points_at=$(
( (
echo "master" echo "master"
@ -349,25 +360,26 @@ then
done done
) )
) )
# Write out remotes/$origin file.
case "$head_points_at" in case "$head_points_at" in
?*) ?*)
mkdir -p "$GIT_DIR/remotes" && mkdir -p "$GIT_DIR/remotes" &&
echo >"$GIT_DIR/remotes/origin" \ echo >"$GIT_DIR/remotes/$origin" \
"URL: $repo "URL: $repo
Pull: refs/heads/$head_points_at:refs/$origin" && Pull: refs/heads/$head_points_at:refs/$origin_tracking" &&
case "$use_separate_remote" in case "$use_separate_remote" in
t) git-update-ref HEAD "$head_sha1" ;; t) git-update-ref HEAD "$head_sha1" ;;
*) git-update-ref "refs/$origin" $(git-rev-parse HEAD) *) git-update-ref "refs/$origin" $(git-rev-parse HEAD)
esac && esac &&
(cd "$GIT_DIR" && find "$remote_top" -type f -print) | (cd "$GIT_DIR/$remote_top" && find . -type f -print) |
while read ref while read dotslref
do do
head=`expr "$ref" : 'refs/\(.*\)'` && name=`expr "$dotslref" : './\(.*\)'` &&
name=`expr "$ref" : 'refs/[^\/]*/\(.*\)'` &&
test "$head_points_at" = "$name" || test "$head_points_at" = "$name" ||
test "$origin" = "$head" || test "$origin" = "$head" ||
echo "Pull: refs/heads/${name}:$remote_top/${name}" echo "Pull: refs/heads/${name}:$remote_top/${name}"
done >>"$GIT_DIR/remotes/origin" done >>"$GIT_DIR/remotes/$origin"
esac esac
case "$no_checkout" in case "$no_checkout" in