summaryrefslogtreecommitdiff
path: root/git-clone.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-10 08:12:50 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-10 08:12:50 (GMT)
commit5e3a620cd5f7baaf27198192a614271c6145ec3b (patch)
treed5b4ed39c17a2fccaff0e61b439fa922c000bed4 /git-clone.sh
parent138086a72582620e0b3ec0aa60a78da208e89a2a (diff)
downloadgit-5e3a620cd5f7baaf27198192a614271c6145ec3b.zip
git-5e3a620cd5f7baaf27198192a614271c6145ec3b.tar.gz
git-5e3a620cd5f7baaf27198192a614271c6145ec3b.tar.bz2
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>
Diffstat (limited to 'git-clone.sh')
-rwxr-xr-xgit-clone.sh8
1 files changed, 2 insertions, 6 deletions
diff --git a/git-clone.sh b/git-clone.sh
index 64318b4..6fa0daa 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