development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-23 18:00:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/clone-allow-bare-and-o-together' into maint-2.38

Browse source 
"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"
This commit is contained in:
Junio C Hamano 2022-10-25 17:11:33 -07:00
parent 665d7e08b4 3b910d6e29
commit 0d5d92906a
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
builtin/clone.c
View file

@ -931,9 +931,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;

9
t/t5606-clone-options.sh
View file

@ -42,11 +42,12 @@ test_expect_success 'rejects invalid -o/--origin' '
'
test_expect_success 'disallows --bare with --origin' '
test_expect_success 'clone --bare -o' '
test_must_fail git clone -o foo --bare parent clone-bare-o 2>err &&
test_debug "cat err" &&
test_i18ngrep -e "options .--bare. and .--origin foo. cannot be used together" err
git clone -o foo --bare parent clone-bare-o &&
(cd parent && pwd) >expect &&
git -C clone-bare-o config remote.foo.url >actual &&
test_cmp expect actual
'