aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-10-10 10:08:39 -0700
committerJunio C Hamano <gitster@pobox.com>2022-10-10 10:08:39 -0700
commit7aeb0d4c47878a04e19cffe2ddf20d642df56414 (patch)
tree1b01cb6f5a50c867f473d40b0a40ad016b5f2339 /builtin
parentfdbfac60fd889d4e55244958ce7febd61cb53f9d (diff)
parent3b910d6e2911a48a2a6945094f79dacd5367b799 (diff)
downloadgit-7aeb0d4c47878a04e19cffe2ddf20d642df56414.tar.xz
Merge branch 'jk/clone-allow-bare-and-o-together'
"git clone" did not like to see the "--bare" and the "--origin" options used together without a good reason. * jk/clone-allow-bare-and-o-together: clone: allow "--bare" with "-o"
Diffstat (limited to 'builtin')
-rw-r--r--builtin/clone.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/builtin/clone.c b/builtin/clone.c
index d269d6fec6..ed8d44bb6a 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -929,9 +929,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
option_bare = 1;
if (option_bare) {
- if (option_origin)
- die(_("options '%s' and '%s %s' cannot be used together"),
- "--bare", "--origin", option_origin);
if (real_git_dir)
die(_("options '%s' and '%s' cannot be used together"), "--bare", "--separate-git-dir");
option_no_checkout = 1;