diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-21 20:15:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-21 20:15:08 -0800 |
| commit | 68434e287988f697a6565cb4666598bd8033f46f (patch) | |
| tree | 62551424eb7a2f661dd775bbab6df32119979066 /builtin | |
| parent | e9abef6289706f77186ed852d579c7b222f06502 (diff) | |
| parent | 95b63f1ebb1d2b1ae34238cac331dd1e6e437975 (diff) | |
| download | git-68434e287988f697a6565cb4666598bd8033f46f.tar.gz | |
Merge branch 'nd/clone-no-separate-git-dir-with-bare'
Forbid a useless combination of options to "git clone".
* 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; } |