summaryrefslogtreecommitdiff
path: root/builtin/clone.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-25 16:03:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-02-25 16:03:27 (GMT)
commit0e0c3f25d07c60a4516b0b4bd22135b416f127e7 (patch)
treee2e3f857aafd38a4f201d1f96e6af97df1e01c90 /builtin/clone.c
parenta8e00d7b83e0c810a16cb441b9d0601be7706f2c (diff)
parent95b63f1ebb1d2b1ae34238cac331dd1e6e437975 (diff)
downloadgit-0e0c3f25d07c60a4516b0b4bd22135b416f127e7.zip
git-0e0c3f25d07c60a4516b0b4bd22135b416f127e7.tar.gz
git-0e0c3f25d07c60a4516b0b4bd22135b416f127e7.tar.bz2
Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maint
* nd/clone-no-separate-git-dir-with-bare: clone: forbid --bare --separate-git-dir <dir>
Diffstat (limited to 'builtin/clone.c')
-rw-r--r--builtin/clone.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/clone.c b/builtin/clone.c
index 8d23a62..36ec99d 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -704,6 +704,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
if (option_origin)
die(_("--bare and --origin %s options are incompatible."),
option_origin);
+ if (real_git_dir)
+ die(_("--bare and --separate-git-dir are incompatible."));
option_no_checkout = 1;
}