[PATCH] clone: Remove constraint on --bare and --origin
- From
Øystein Walle <oystwa@gmail.com>
- Date
- Aug 1, 2021, 08:25 UTC
- Message-ID
- <20210801082546.18543-1-oystwa@gmail.com>
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