mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
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:
parent
c9bc159d7f
commit
2048bb00ee
15
git-clone.sh
15
git-clone.sh
|
@ -391,11 +391,16 @@ Pull: refs/heads/$head_points_at:$origin_track" &&
|
|||
(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
|
||||
|
|
Loading…
Reference in a new issue