mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-06 04:01:26 +02:00
Code

Merge branch 'jc/clone' into next

Browse Source 
* jc/clone:
  clone: record the remote primary branch with remotes/$origin/HEAD
This commit is contained in:
Junio C Hamano 2006-03-21 02:04:50 -08:00
commit d293b28127
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git-clone.sh
View File

@ -45,7 +45,7 @@ Perhaps git-update-server-info needs to be run there?"
if test -n "$use_separate_remote" &&
branch_name=`expr "$name" : 'heads/\(.*\)'`
then
tname="remotes/$branch_name"
tname="remotes/$origin/$branch_name"
else
tname=$name
fi
@ -370,7 +370,7 @@ then
Pull: refs/heads/$head_points_at:refs/$origin_tracking" &&
case "$use_separate_remote" in
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 &&
(cd "$GIT_DIR/$remote_top" && find . -type f -print) |
while read dotslref
@ -379,7 +379,13 @@ Pull: refs/heads/$head_points_at:refs/$origin_tracking" &&
test "$head_points_at" = "$name" ||
test "$origin" = "$head" ||
echo "Pull: refs/heads/${name}:$remote_top/${name}"
done >>"$GIT_DIR/remotes/$origin"
done >>"$GIT_DIR/remotes/$origin" &&
case "$use_separate_remote" in
t)
rm -f "refs/remotes/$origin/HEAD"
git-symbolic-ref "refs/remotes/$origin/HEAD" \
"refs/remotes/$origin/$head_points_at"
esac
esac
case "$no_checkout" in