From: Junio C Hamano <junkio@cox.net>
Date: Sat, 10 Jun 2006 08:12:50 +0000 (-0700)
Subject: git-clone: fix --bare over dumb-http
X-Git-Tag: v1.4.0~3
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=5e3a620cd5f7baaf27198192a614271c6145ec3b;p=git.git

git-clone: fix --bare over dumb-http

It left an extra .git/ directory under the target directory by
mistake.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-clone.sh b/git-clone.sh
index 64318b4d..6fa0daaa 100755
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -29,7 +29,7 @@ http_fetch () {
 clone_dumb_http () {
 	# $1 - remote, $2 - local
 	cd "$2" &&
-	clone_tmp='.git/clone-tmp' &&
+	clone_tmp="$GIT_DIR/clone-tmp" &&
 	mkdir -p "$clone_tmp" || exit 1
 	http_fetch "$1/info/refs" "$clone_tmp/refs" || {
 		echo >&2 "Cannot get remote repository information.
@@ -207,15 +207,11 @@ mkdir -p "$dir" &&
 D=$(cd "$dir" && pwd) &&
 trap 'err=$?; cd ..; rm -r "$D"; exit $err' 0
 case "$bare" in
-yes) GIT_DIR="$D" ;;
-*) GIT_DIR="$D/.git" ;;
-esac && export GIT_DIR && git-init-db ${template+"$template"} || usage
-case "$bare" in
 yes)
 	GIT_DIR="$D" ;;
 *)
 	GIT_DIR="$D/.git" ;;
-esac
+esac && export GIT_DIR && git-init-db ${template+"$template"} || usage
 
 if test -n "$reference"
 then