From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 9 Jun 2007 04:03:04 +0000 (-0700)
Subject: Merge branch 'ar/clone'
X-Git-Tag: v1.5.3-rc0~138
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/52912cce77a929aecaa4e982757d813b8d36ba1e?ds=inline;hp=-c

Merge branch 'ar/clone'

* ar/clone:
Fix clone to setup the origin if its name ends with .git
---

52912cce77a929aecaa4e982757d813b8d36ba1e
diff --combined git-clone.sh
index 5bfd8d1556,d45618d9af..3a410624d3
--- a/git-clone.sh
+++ b/git-clone.sh
@@@ -2,7 -2,7 +2,7 @@@
  #
  # Copyright (c) 2005, Linus Torvalds
  # Copyright (c) 2005, Junio C Hamano
 -# 
 +#
  # Clone a repository into a different directory that does not yet exist.
  
  # See git-sh-setup why.
@@@ -20,7 -20,7 +20,7 @@@ usage() 
  get_repo_base() {
  	(
  		cd "`/bin/pwd`" &&
- 		cd "$1" &&
+ 		cd "$1" || cd "$1.git" &&
  		{
  			cd .git
  			pwd
@@@ -98,7 -98,7 +98,7 @@@ whil
  	*,--na|*,--nak|*,--nake|*,--naked|\
  	*,-b|*,--b|*,--ba|*,--bar|*,--bare) bare=yes ;;
  	*,-l|*,--l|*,--lo|*,--loc|*,--loca|*,--local) use_local=yes ;;
 -        *,-s|*,--s|*,--sh|*,--sha|*,--shar|*,--share|*,--shared) 
 +        *,-s|*,--s|*,--sh|*,--sha|*,--shar|*,--share|*,--shared)
            local_shared=yes; use_local=yes ;;
  	1,--template) usage ;;
  	*,--template)
@@@ -410,3 -410,4 +410,3 @@@ f
  rm -f "$GIT_DIR/CLONE_HEAD" "$GIT_DIR/REMOTE_HEAD"
  
  trap - 0
 -