From: "lilinchao@oschina.cn" <lilinchao@oschina.cn>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: "Li Linchao via GitGitGadget" <gitgitgadget@gmail.com>,
git <git@vger.kernel.org>, "Derrick Stolee" <stolee@gmail.com>,
dscho <johannes.schindelin@gmx.de>
Subject: Re: Re: [PATCH v3] builtin/clone.c: add --reject-shallow option
Date: Sat, 20 Feb 2021 18:40:41 +0800 [thread overview]
Message-ID: <1689e980736811eb80250026b95c99cc@oschina.cn> (raw)
In-Reply-To: eaa219a86bbc11ebb6c7a4badb2c2b1165032@pobox.com
--------------
lilinchao@oschina.cn
>"lilinchao@oschina.cn" <lilinchao@oschina.cn> writes:
>
>> Sorry, you may forget there is a re-read git-config under these lines
>
>Ahhhh, thanks. You're right that "clone" is "special" in that way
>and requires unusual order---I forgot about that.
>
>>>This is only for cloning from a local repository, no? IOW, path at
>>>this point may even be "git://github.com/git/git/" and checking with
>>>access() does not make sense.
>>>
>>>Ah, it is even worse. get_repo_path() can return NULL, so mkpath()
>>>will crash in such a case. This must be at least
>>>
>>> if (path && !access(mkpath("%s/shallow", path), F_OK))
>>> is_shallow = 1;
>>> ...
>>>
>>>So, I think the above two hunks are making the code worse. If we
>>>are to detect and reject cloning from the shallow repository when
>>>going through the transport layer (i.e. "--no-local" or cloning from
>>>"git://github.com/git/git", or "https://github.com/git/git", if it
>>>were a shallow repository), that must be handled separately.
>>>
>> Sorry, I made the question simple. Reject cloning a shallow repository
>> should apply to all four type transport protocols. There still a bunch of
>> work to be done.
>
>Sorry, but I didn't realize that this is just a work-in-progress
>that shows an early "only local transport is covered" preview. I
>think, modulo that the access(mkpath()) thing should be in the "if
>(is_local)" block, the patch covers the case of local transport well
>enough. I think by "four types of transport" you mean ssh://, git://
>https:// etc., but they all go through the same transport API, so
>hopefully once one of them, say, git://, is covered, that would take
>us a long way.
>
Hi, after some exploration, I found that the following changes
can achieve the goal:
(around at line 1386 in builtin/clone.c)
/* below part is my changes */
if (reject_shallow) {
if (local_shallow || is_repository_shallow(the_repository)) {
die(_("source repository is shallow, reject to clone."));
}
}
/* end */
update_remote_refs(refs, mapped_refs, remote_head_points_at,
branch_top.buf, reflog_msg.buf, transport,
!is_local);
as it shows, using existing method "is_repository_shallow" to detect
whether the repo is shallow or not, before "update_remote_refs"
I made some tests based on this change, and it seems ok.
what do you think about this?
>Thanks.
next prev parent reply other threads:[~2021-02-20 11:10 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-04 3:31 [PATCH] builtin/clone.c: add --no-shallow option Li Linchao via GitGitGadget
2021-02-04 5:50 ` Junio C Hamano
2021-02-04 10:32 ` lilinchao
2021-02-04 18:36 ` Junio C Hamano
2021-02-04 14:00 ` Johannes Schindelin
2021-02-04 18:24 ` Junio C Hamano
2021-02-08 8:31 ` [PATCH v2 0/2] " Li Linchao via GitGitGadget
2021-02-08 8:31 ` [PATCH v2 1/2] " lilinchao via GitGitGadget
2021-02-08 8:31 ` [PATCH v2 2/2] builtin/clone.c: add --reject-shallow option lilinchao via GitGitGadget
2021-02-08 13:33 ` [PATCH v2 0/2] builtin/clone.c: add --no-shallow option Derrick Stolee
[not found] ` <32bb0d006a1211ebb94254a05087d89a835@gmail.com>
2021-02-08 13:48 ` lilinchao
2021-02-08 14:12 ` [PATCH v3] builtin/clone.c: add --reject-shallow option Li Linchao via GitGitGadget
2021-02-09 20:32 ` Junio C Hamano
[not found] ` <026bd8966b1611eb975aa4badb2c2b1190694@pobox.com>
2021-02-10 9:07 ` lilinchao
2021-02-10 16:27 ` Junio C Hamano
[not found] ` <eaa219a86bbc11ebb6c7a4badb2c2b1165032@pobox.com>
2021-02-20 10:40 ` lilinchao [this message]
2021-02-21 7:05 ` [PATCH v4] " Li Linchao via GitGitGadget
2021-02-22 18:12 ` Junio C Hamano
2021-03-01 22:03 ` Jonathan Tan
2021-03-01 22:34 ` Junio C Hamano
2021-03-02 8:44 ` lilinchao
2021-03-03 23:59 ` Junio C Hamano
2021-03-04 1:53 ` Jonathan Tan
[not found] ` <8f3c00de753911eb93d3d4ae5278bc1270191@pobox.com>
2021-02-28 17:58 ` lilinchao
2021-02-28 18:06 ` [PATCH v5] " Li Linchao via GitGitGadget
2021-03-01 7:11 ` lilinchao
2021-03-01 22:40 ` Johannes Schindelin
2021-03-04 6:26 ` lilinchao
2021-03-03 23:21 ` Junio C Hamano
2021-03-04 5:50 ` lilinchao
2021-03-04 17:19 ` [PATCH v6] " Li Linchao via GitGitGadget
2021-03-12 18:25 ` lilinchao
2021-03-25 11:09 ` [PATCH v7] " Li Linchao via GitGitGadget
2021-03-25 20:31 ` Junio C Hamano
2021-03-25 22:57 ` Junio C Hamano
[not found] ` <19c9dc128da911ebacc7d4ae5278bc1233465@pobox.com>
2021-03-26 3:34 ` lilinchao
[not found] ` <7a71c96c8dbd11eb8bb0d4ae5278bc1296681@pobox.com>
2021-03-26 3:49 ` lilinchao
2021-03-29 10:19 ` [PATCH v8] " Li Linchao via GitGitGadget
2021-03-29 21:36 ` Junio C Hamano
2021-03-30 9:54 ` Johannes Schindelin
2021-03-30 17:46 ` Junio C Hamano
2021-03-31 13:30 ` Johannes Schindelin
[not found] ` <f8b2582c913d11ebaddbd4ae5278bc1214940@gmx.de>
2021-03-31 11:03 ` lilinchao
2021-03-31 15:51 ` [PATCH v9] " lilinchao via GitGitGadget
2021-03-31 19:14 ` Junio C Hamano
2021-03-31 22:24 ` Johannes Schindelin
2021-03-31 22:37 ` Junio C Hamano
2021-04-01 10:46 ` [PATCH v10] " Li Linchao via GitGitGadget
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=1689e980736811eb80250026b95c99cc@oschina.cn \
--to=lilinchao@oschina.cn \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=stolee@gmail.com \
/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).