diff options
author | Junio C Hamano <junkio@cox.net> | 2006-06-08 21:23:35 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-08 21:23:35 -0700 |
commit | 55becd7b5fdbd93a2928a659a670d004d30d7c37 (patch) | |
tree | 18e1ad1c22d8b90da241761b0061bf68e0745457 /git-clone.sh | |
parent | Merge branch 'master' into next (diff) | |
parent | date.c: improve guess between timezone offset and year. (diff) | |
download | tgif-55becd7b5fdbd93a2928a659a670d004d30d7c37.tar.xz |
Merge branch 'pe/date' into next
* pe/date:
date.c: improve guess between timezone offset and year.
git-rm: honor -n flag.
git-clone: fix duplicated "master" in $GIT_DIR/remotes/origin
check for error return from fork()
Document git-clone --use-separate-remote
Diffstat (limited to 'git-clone.sh')
-rwxr-xr-x | git-clone.sh | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/git-clone.sh b/git-clone.sh index de59904d56..64318b4dd3 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 |