Browse Source

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>
maint
Junio C Hamano 19 years ago
parent
commit
5e3a620cd5
  1. 8
      git-clone.sh

8
git-clone.sh

@ -29,7 +29,7 @@ http_fetch () {
clone_dumb_http () { clone_dumb_http () {
# $1 - remote, $2 - local # $1 - remote, $2 - local
cd "$2" && cd "$2" &&
clone_tmp='.git/clone-tmp' && clone_tmp="$GIT_DIR/clone-tmp" &&
mkdir -p "$clone_tmp" || exit 1 mkdir -p "$clone_tmp" || exit 1
http_fetch "$1/info/refs" "$clone_tmp/refs" || { http_fetch "$1/info/refs" "$clone_tmp/refs" || {
echo >&2 "Cannot get remote repository information. echo >&2 "Cannot get remote repository information.
@ -207,15 +207,11 @@ mkdir -p "$dir" &&
D=$(cd "$dir" && pwd) && D=$(cd "$dir" && pwd) &&
trap 'err=$?; cd ..; rm -r "$D"; exit $err' 0 trap 'err=$?; cd ..; rm -r "$D"; exit $err' 0
case "$bare" in 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) yes)
GIT_DIR="$D" ;; GIT_DIR="$D" ;;
*) *)
GIT_DIR="$D/.git" ;; GIT_DIR="$D/.git" ;;
esac esac && export GIT_DIR && git-init-db ${template+"$template"} || usage


if test -n "$reference" if test -n "$reference"
then then

Loading…
Cancel
Save