X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-clone.sh;h=4ed861d576bfaefa768f811a59d2ec53d233b5df;hb=a7cfb4a43fce841cd673057cf4137f85e6f804eb;hp=d184ceb7a6f2a7d4ffc3a002b1a8846c46297f33;hpb=0f4aa3993de5fc7252e43ebd872fd9e4b615873d;p=git.git

diff --git a/git-clone.sh b/git-clone.sh
index d184ceb7..4ed861d5 100755
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -118,7 +118,7 @@ dir="$2"
 [ -e "$dir" ] && echo "$dir already exists." && usage
 mkdir -p "$dir" &&
 D=$(cd "$dir" && pwd) &&
-trap 'err=$?; rm -r $D; exit $err' exit
+trap 'err=$?; cd ..; rm -r "$D"; exit $err' exit
 case "$bare" in
 yes) GIT_DIR="$D" ;;
 *) GIT_DIR="$D/.git" ;;
@@ -154,7 +154,7 @@ yes,yes)
 	    fi &&
 	    rm -f "$GIT_DIR/objects/sample" &&
 	    cd "$repo" &&
-	    find objects -depth -print | cpio -puamd$l "$GIT_DIR/" || exit 1
+	    find objects -depth -print | cpio -pumd$l "$GIT_DIR/" || exit 1
 	    ;;
 	yes)
 	    mkdir -p "$GIT_DIR/objects/info"
@@ -253,7 +253,7 @@ Pull: $head_points_at:$origin" &&
 
 	case "$no_checkout" in
 	'')
-		git checkout
+		git-read-tree -m -u -v HEAD HEAD
 	esac
 fi