From: Uwe Zeisberger Date: Thu, 08 Jun 2006 12:33:38 GMT Subject: Re: HEAD branch duplicated in remotes/origin Message-ID: <20060608123337.GA12456@informatik.uni-freiburg.de> In-Reply-To: <7vverc9i4i.fsf@assigned-by-dhcp.cox.net> Hello Junio, Junio C Hamano wrote: > Uwe Zeisberger writes: > > > when cloning with --use-separate-remote, $GITDIR/remotes/origin contains > > two references to refs/heads/master. > > Thanks for noticing. > > Very lightly tested but I think this should fix it. > -- >8 -- > 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 > --- > diff --git a/git-clone.sh b/git-clone.sh > index de59904..64318b4 100755 > --- a/git-clone.sh > +++ b/git-clone.sh > @@ -391,11 +391,16 @@ Pull: refs/heads/$head_points_at:$origin > (cd "$GIT_DIR/$remote_top" && find . -type f -print) | > while read dotslref > do > - name=`expr "$dotslref" : './\(.*\)'` && > - test "$use_separate_remote" = '' && { > - test "$head_points_at" = "$name" || > - test "$origin" = "$name" > - } || > + name=`expr "$dotslref" : './\(.*\)'` > + if test "z$head_points_at" = "z$name" > + then > + continue > + fi > + if test "$use_separate_remote" = '' && > + test "z$origin" = "z$name" > + then > + continue > + fi > echo "Pull: refs/heads/${name}:$remote_top/${name}" > done >>"$GIT_DIR/remotes/$origin" && > case "$use_separate_remote" in > I wonder if this is easier not to add the other duplicate. That is let this as it is and don't add the head HEAD points at. Don't know, didn't look into it. Moreover, is it sound to error if a Pull: line is duplicated? In my eyes at least the error message is wrong/missleading. Otherwise the patch works for me, but probably I only did the same testing as you. Best regards Uwe -- Uwe Zeisberger cal 9 1752 | grep 10