From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id D9D821F9E5 for ; Tue, 8 Jun 2021 14:39:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233522AbhFHOkO (ORCPT ); Tue, 8 Jun 2021 10:40:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233316AbhFHOkN (ORCPT ); Tue, 8 Jun 2021 10:40:13 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10841C061574 for ; Tue, 8 Jun 2021 07:38:06 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id a11so19983795wrt.13 for ; Tue, 08 Jun 2021 07:38:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=sslxU2Zj/H3zu0TbnQu1d/Mc+WxpiqXZj8t9ARAzits=; b=sGq4zku9ONHjU4NKEKjbLddmufN9Yp3T4Hamn3/HOXAaZjAfdkbWYf5GHppxom9cNi JDQFEHVsKmZzo+2IxeS+tHClhPTc6VE6FjXg9XpM4zVdy4qlgpCCUrk5mfnI6iN0VTc6 42T3TccOE29SKT3QAN+CNa+keN9vxnaniVEiMxW8/ytdO3dx+uWbXWvmT1NsTA9jcRqI gumJoLbS9IeDJIXv9zdWd9JqYfjW/3i6RxJpHlZqG8QHkmHzgv6+SllURG+ndriBQ50m ZK8K4VwxFnw1g9F/52pn0tkjalhz5uCjblHUWMRhFtYh3nxj/EBn1lxhoryYMhQnmHx5 ychQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=sslxU2Zj/H3zu0TbnQu1d/Mc+WxpiqXZj8t9ARAzits=; b=TDmnWhAb9EpRoDyIO/8kk2D0NfxKWaChRE+2fvmSQR1jeh8aS+7Eo+qJSxala2RNUD DpqdfmFbifdohJwjOJkWyqiJ9vTMaG9SDMr3bhwIwPwIFObzSW9I0XtT16Oy+tjpTD3+ nWkhpTMfwxPKGbdWgUuoqWfG57tOyxlFkSspSIu3/gdIVhiL+2Jb16LnitT0YRp7Z1uh YO4UrIjV2wlsQ2+jaisVfUPt4TPa/FMPSamGl951Q3uy3bunvHgmuPb7md0w2oIVqG4p RdmjTFVjPOEiRSRnADpzEOg1mXbAeV/NjTua17IsEmka1pVR2Mt0dWOEVO0jn8mUujim RMeQ== X-Gm-Message-State: AOAM531DLdatPdK8hH4QcZclMmm66PhFJ5OtY76Fewn+r4AC68GIO+f3 tSaNgIwUZoZglvsmEtAHRiRSX04hTV4= X-Google-Smtp-Source: ABdhPJxNgv8kHnQW7v6uzGTVkUrQVqUpl/MyLqOY8HU3eWEVySUTycpI+azf6oDTk5QhZquwybhlAw== X-Received: by 2002:a05:6000:1203:: with SMTP id e3mr16985624wrx.107.1623163084707; Tue, 08 Jun 2021 07:38:04 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u14sm3032184wmc.41.2021.06.08.07.38.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 07:38:04 -0700 (PDT) Message-Id: <48d256db5c349c1fa0615bb60d74039c78a831fd.1623163082.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "ZheNing Hu via GitGitGadget" Date: Tue, 08 Jun 2021 14:37:59 +0000 Subject: [PATCH 1/4] [GSOC] ref-filter: add obj-type check in grab contents Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Christian Couder , Hariom Verma , Bagas Sanjaya , ZheNing Hu , ZheNing Hu Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: ZheNing Hu Only tag and commit objects use `grab_sub_body_contents()` to grab object contents in the current codebase. We want to teach the function to also handle blobs and trees to get their raw data, without parsing a blob (whose contents looks like a commit or a tag) incorrectly as a commit or a tag. Skip the block of code that is specific to handling commits and tags early when the given object is of a wrong type to help later addition to handle other types of objects in this function. Mentored-by: Christian Couder Mentored-by: Hariom Verma Helped-by: Junio C Hamano Signed-off-by: ZheNing Hu --- ref-filter.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/ref-filter.c b/ref-filter.c index 4db0e40ff4c6..5cee6512fbaf 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1356,11 +1356,12 @@ static void append_lines(struct strbuf *out, const char *buf, unsigned long size } /* See grab_values */ -static void grab_sub_body_contents(struct atom_value *val, int deref, void *buf) +static void grab_sub_body_contents(struct atom_value *val, int deref, struct expand_data *data) { int i; const char *subpos = NULL, *bodypos = NULL, *sigpos = NULL; size_t sublen = 0, bodylen = 0, nonsiglen = 0, siglen = 0; + void *buf = data->content; for (i = 0; i < used_atom_cnt; i++) { struct used_atom *atom = &used_atom[i]; @@ -1371,10 +1372,13 @@ static void grab_sub_body_contents(struct atom_value *val, int deref, void *buf) continue; if (deref) name++; - if (strcmp(name, "body") && - !starts_with(name, "subject") && - !starts_with(name, "trailers") && - !starts_with(name, "contents")) + + if ((data->type != OBJ_TAG && + data->type != OBJ_COMMIT) || + (strcmp(name, "body") && + !starts_with(name, "subject") && + !starts_with(name, "trailers") && + !starts_with(name, "contents"))) continue; if (!subpos) find_subpos(buf, @@ -1438,17 +1442,19 @@ static void fill_missing_values(struct atom_value *val) * pointed at by the ref itself; otherwise it is the object the * ref (which is a tag) refers to. */ -static void grab_values(struct atom_value *val, int deref, struct object *obj, void *buf) +static void grab_values(struct atom_value *val, int deref, struct object *obj, struct expand_data *data) { + void *buf = data->content; + switch (obj->type) { case OBJ_TAG: grab_tag_values(val, deref, obj); - grab_sub_body_contents(val, deref, buf); + grab_sub_body_contents(val, deref, data); grab_person("tagger", val, deref, buf); break; case OBJ_COMMIT: grab_commit_values(val, deref, obj); - grab_sub_body_contents(val, deref, buf); + grab_sub_body_contents(val, deref, data); grab_person("author", val, deref, buf); grab_person("committer", val, deref, buf); break; @@ -1678,7 +1684,7 @@ static int get_object(struct ref_array_item *ref, int deref, struct object **obj return strbuf_addf_ret(err, -1, _("parse_object_buffer failed on %s for %s"), oid_to_hex(&oi->oid), ref->refname); } - grab_values(ref->value, deref, *obj, oi->content); + grab_values(ref->value, deref, *obj, oi); } grab_common_values(ref->value, deref, oi); -- gitgitgadget