git-clone: fix duplicated "master" in $GIT_DIR/remotes/origin

Under --use-separate-remote we ended up duplicating the branch
remote HEAD pointed at in $GIT_DIR/remotes/origin file.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-06-08 01:17:01 -07:00
parent c9bc159d7f
commit 2048bb00ee

View File

@ -391,11 +391,16 @@ Pull: refs/heads/$head_points_at:$origin_track" &&
(cd "$GIT_DIR/$remote_top" && find . -type f -print) | (cd "$GIT_DIR/$remote_top" && find . -type f -print) |
while read dotslref while read dotslref
do do
name=`expr "$dotslref" : './\(.*\)'` && name=`expr "$dotslref" : './\(.*\)'`
test "$use_separate_remote" = '' && { if test "z$head_points_at" = "z$name"
test "$head_points_at" = "$name" || then
test "$origin" = "$name" continue
} || fi
if test "$use_separate_remote" = '' &&
test "z$origin" = "z$name"
then
continue
fi
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" &&
case "$use_separate_remote" in case "$use_separate_remote" in