From: Junio C Hamano <junkio@cox.net>
Date: Mon, 23 Jan 2006 01:27:52 +0000 (-0800)
Subject: clone: do not create remotes/origin nor origin branch in a bare repository.
X-Git-Tag: v1.2.0~115^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4fb66a62eeb7bfec115cd0058d7a05ab62fc23e7;p=git.git

clone: do not create remotes/origin nor origin branch in a bare repository.

It is simply pointless, since no merges will ever happen in such
a repository.

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

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 370f53e76..684e4bdf6 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -62,7 +62,9 @@ OPTIONS
 	Make a 'bare' GIT repository.  That is, instead of
 	creating `<directory>` and placing the administrative
 	files in `<directory>/.git`, make the `<directory>`
-	itself the `$GIT_DIR`. This implies `-n` option.
+	itself the `$GIT_DIR`. This implies `-n` option.  When
+	this option is used, neither the `origin` branch nor the
+	default	`remotes/origin` file is created.
 
 -o <name>::
 	Instead of using the branch name 'origin' to keep track
diff --git a/git-clone.sh b/git-clone.sh
index 8e6520232..73fc91980 100755
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -209,7 +209,7 @@ esac
 
 cd "$D" || exit
 
-if test -f "$GIT_DIR/HEAD"
+if test -f "$GIT_DIR/HEAD" && test -z "$bare"
 then
 	head_points_at=`git-symbolic-ref HEAD`
 	case "$head_points_at" in