undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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-10 10:08:39 -07:00
commit 7aeb0d4c47
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

@ -929,9 +929,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
option_bare = 1; option_bare = 1;
if (option_bare) { if (option_bare) {
if (option_origin)
die(_("options '%s' and '%s %s' cannot be used together"),
"--bare", "--origin", option_origin);
if (real_git_dir) if (real_git_dir)
die(_("options '%s' and '%s' cannot be used together"), "--bare", "--separate-git-dir"); die(_("options '%s' and '%s' cannot be used together"), "--bare", "--separate-git-dir");
option_no_checkout = 1; 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 && git clone -o foo --bare parent clone-bare-o &&
test_debug "cat err" && (cd parent && pwd) >expect &&
test_i18ngrep -e "options .--bare. and .--origin foo. cannot be used together" err git -C clone-bare-o config remote.foo.url >actual &&
test_cmp expect actual
' '