diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:03:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:03:27 -0800 |
| commit | 0e0c3f25d07c60a4516b0b4bd22135b416f127e7 (patch) | |
| tree | e2e3f857aafd38a4f201d1f96e6af97df1e01c90 /builtin | |
| parent | Merge branch 'da/p4merge-mktemp' into maint (diff) | |
| parent | clone: forbid --bare --separate-git-dir <dir> (diff) | |
| download | tgif-0e0c3f25d07c60a4516b0b4bd22135b416f127e7.tar.xz | |
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')
| -rw-r--r-- | builtin/clone.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 8d23a62e8a..36ec99db3f 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; } |