mirror of
https://github.com/git/git
synced 2024-08-23 18:00:25 +00:00
Merge branch 'jk/clone-allow-bare-and-o-together' into maint-2.38
"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:
commit
0d5d92906a
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
||||
'
|
||||
|
||||
|
|
Loading…
Reference in a new issue