summaryrefslogtreecommitdiff
path: root/git-clone.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-08 08:17:01 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-08 23:19:37 (GMT)
commit2048bb00ee3937808ce9f0c8f59d71a9b46ab56f (patch)
treec42833c3cd3444c4ab7707304b5c705022709b5b /git-clone.sh
parentc9bc159d7f41e2916830b05529c1ce06a81d975f (diff)
downloadgit-2048bb00ee3937808ce9f0c8f59d71a9b46ab56f.zip
git-2048bb00ee3937808ce9f0c8f59d71a9b46ab56f.tar.gz
git-2048bb00ee3937808ce9f0c8f59d71a9b46ab56f.tar.bz2
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>
Diffstat (limited to 'git-clone.sh')
-rwxr-xr-xgit-clone.sh15
1 files changed, 10 insertions, 5 deletions
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_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