From: Richard Oliver <roliver@roku.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, Taylor Blau <me@ttaylorr.com>,
Derrick Stolee <derrickstolee@github.com>,
git@vger.kernel.org, jonathantanmy@google.com
Subject: [PATCH] mktree: Make '--missing' behave as documented
Date: Thu, 16 Jun 2022 16:46:00 +0100 [thread overview]
Message-ID: <1566aed1-a38f-a9ca-241c-21b56d732328@roku.com> (raw)
In-Reply-To: <xmqqa6adzln6.fsf@gitster.g>
On 15/06/2022 22:01, Junio C Hamano wrote:
> We by grave mistake at 31c8221a (mktree: validate entry type in
> input, 2009-05-14) started insisting on inspecting objects even when
> allow-mising was given. I do not think it was sensible, given why
> we had "--missing" as an option to allow users to say "you do not
> have to be too paranoid".
>
> The codebase is so distant but I think we should probably do a moral
> revert/reconstruct of that commit so that the extra paranoia of the
> said commit applies only when "--missing" is not in effect, or
> something like that.
-- >8 --
Subject: [PATCH] mktree: Make '--missing' behave as documented
Do not make use of the object store to verify object type for
'allow_missing' objects in mktree_line(). GIT-MKTREE(1) documents
'--missing' as disabling "verif[ication] that each tree entry's sha1
identifies an existing object".
This change retains the check for '<mode>' and '<type>' for
'allow_missing' objects as this check is merely input validation that
avoids interrogating the object store.
Signed-off-by: Richard Oliver <roliver@roku.com>
---
builtin/mktree.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/builtin/mktree.c b/builtin/mktree.c
index 902edba6d2..f41fda6e7d 100644
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -116,15 +116,12 @@ static void mktree_line(char *buf, int nul_term_line, int allow_missing)
path, ptr, type_name(mode_type));
}
- /* Check the type of object identified by sha1 */
- obj_type = oid_object_info(the_repository, &oid, NULL);
- if (obj_type < 0) {
- if (allow_missing) {
- ; /* no problem - missing objects are presumed to be of the right type */
- } else {
+ if (!allow_missing) {
+ /* Check the type of object identified by sha1 */
+ obj_type = oid_object_info(the_repository, &oid, NULL);
+ if (obj_type < 0) {
die("entry '%s' object %s is unavailable", path, oid_to_hex(&oid));
}
- } else {
if (obj_type != mode_type) {
/*
* The object exists but is of the wrong type.
--
2.36.1.467.g4f6db706e6.dirty
next prev parent reply other threads:[~2022-06-16 15:46 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-14 13:36 [PATCH] mktree: learn about promised objects Richard Oliver
2022-06-14 14:14 ` Derrick Stolee
2022-06-14 16:33 ` Richard Oliver
2022-06-14 17:27 ` Derrick Stolee
2022-06-15 0:35 ` Taylor Blau
2022-06-15 4:00 ` Jeff King
2022-06-15 17:40 ` Richard Oliver
2022-06-15 18:17 ` Derrick Stolee
2022-06-16 6:07 ` Jeff King
2022-06-16 6:54 ` [PATCH] is_promisor_object(): walk promisor packs in pack-order Jeff King
2022-06-16 14:00 ` Derrick Stolee
2022-06-17 19:50 ` Jonathan Tan
2022-06-16 13:59 ` [PATCH] mktree: learn about promised objects Derrick Stolee
2022-06-15 21:01 ` Junio C Hamano
2022-06-16 5:02 ` Jeff King
2022-06-16 15:46 ` Richard Oliver [this message]
2022-06-16 17:44 ` [PATCH] mktree: Make '--missing' behave as documented Junio C Hamano
2022-06-21 13:59 ` [PATCH] mktree: do not check type of remote objects Richard Oliver
2022-06-21 16:51 ` Junio C Hamano
2022-06-21 17:48 ` Junio C Hamano
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=1566aed1-a38f-a9ca-241c-21b56d732328@roku.com \
--to=roliver@roku.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
/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).