summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-23 01:27:52 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-25 07:17:06 (GMT)
commit4fb66a62eeb7bfec115cd0058d7a05ab62fc23e7 (patch)
treeab55d82682368f3c03c2b2933dff5a821f99db9f
parent87e80c4b5fec421ecd566498b7dd4672f76fdca2 (diff)
downloadgit-4fb66a62eeb7bfec115cd0058d7a05ab62fc23e7.zip
git-4fb66a62eeb7bfec115cd0058d7a05ab62fc23e7.tar.gz
git-4fb66a62eeb7bfec115cd0058d7a05ab62fc23e7.tar.bz2
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>
-rw-r--r--Documentation/git-clone.txt4
-rwxr-xr-xgit-clone.sh2
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 370f53e..684e4bd 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 8e65202..73fc919 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