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 370f53e76990a5c7126f095a9c9505e44d163f7d..684e4bdf69bb7eb8ac80b41ba48298d52e4dcdef 100644 (file)
--- 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 8e65202320303d3c4fa591a9d39506b5b4374fd9..73fc919800357b35d8e2550a38517f2b58ece6c3 100755 (executable)
--- 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