From: "Øystein Walle" <oystwa@gmail.com>
To: git@vger.kernel.org
Cc: "Øystein Walle" <oystwa@gmail.com>
Subject: [PATCH] clone: Remove constraint on --bare and --origin
Date: Sun, 1 Aug 2021 10:25:46 +0200 [thread overview]
Message-ID: <20210801082546.18543-1-oystwa@gmail.com> (raw)
This test has been present since long before clone was ported to C. Now
there is no need for it, and since df61c88979 (clone: also configure url
for bare clones, 2010-03-29) it's especially useful to allow both
options.
Signed-off-by: Øystein Walle <oystwa@gmail.com>
---
A question on this constraint popped up on #git the other day. I
investigated a bit and found no particular reason for its existence. All
tests still pass (except the one removed here) and the behavior is as
expected. I realize it might have gone under the radar for 11 years but
it's still worth the noise to remove it, in my opinion.
I wanted to include a bit on the reasoning for the original check in the
commit message but I couldn't find it.
builtin/clone.c | 3 ---
t/t5606-clone-options.sh | 8 --------
2 files changed, 11 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c
index 66fe66679c..70ec72ea85 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -1014,9 +1014,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
option_bare = 1;
if (option_bare) {
- 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;
diff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh
index 3a595c0f82..4a8a2ca6f7 100755
--- a/t/t5606-clone-options.sh
+++ b/t/t5606-clone-options.sh
@@ -30,14 +30,6 @@ test_expect_success 'rejects invalid -o/--origin' '
'
-test_expect_success 'disallows --bare with --origin' '
-
- test_must_fail git clone -o foo --bare parent clone-bare-o 2>err &&
- test_debug "cat err" &&
- test_i18ngrep -e "--bare and --origin foo options are incompatible" err
-
-'
-
test_expect_success 'disallows --bare with --separate-git-dir' '
test_must_fail git clone --bare --separate-git-dir dot-git-destiation parent clone-bare-sgd 2>err &&
--
2.27.0
next reply other threads:[~2021-08-01 8:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-01 8:25 Øystein Walle [this message]
2021-08-02 2:18 ` [PATCH] clone: Remove constraint on --bare and --origin Junio C Hamano
2021-08-02 8:53 ` Ævar Arnfjörð Bjarmason
2021-08-02 17:49 ` [PATCH v2] clone: Allow combining " Øystein Walle
2021-08-03 21:28 ` Junio C Hamano
2021-08-04 13:30 ` Øystein Walle
2021-08-04 17:06 ` Junio C Hamano
2021-08-06 20:23 ` Roman Neuhauser
2021-08-06 22:13 ` Junio C Hamano
2021-08-07 11:18 ` Roman Neuhauser
2021-08-07 22:08 ` Re* " Junio C Hamano
2021-08-08 2:03 ` Roman Neuhauser
2021-08-04 1:16 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210801082546.18543-1-oystwa@gmail.com \
--to=oystwa@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).