From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Taylor Blau <me@ttaylorr.com>
Cc: git@vger.kernel.org, vdye@github.com, jonathantanmy@google.com,
gitster@pobox.com
Subject: Re: [PATCH v2 3/4] builtin/pack-objects.c: ensure included `--stdin-packs` exist
Date: Tue, 24 May 2022 21:46:09 +0200 [thread overview]
Message-ID: <220524.86zgj6vhge.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <cdc3265ec27f04accc433d9e4e54ac0edc3b3746.1653418457.git.me@ttaylorr.com>
On Tue, May 24 2022, Taylor Blau wrote:
> - struct rev_info *revs = _data;
> - struct object_info oi = OBJECT_INFO_INIT;
> off_t ofs;
> - enum object_type type;
> + enum object_type type = OBJ_NONE;
>
> display_progress(progress_state, ++nr_seen);
>
> @@ -3215,20 +3213,25 @@ static int add_object_entry_from_pack(const struct object_id *oid,
> if (!want_object_in_pack(oid, 0, &p, &ofs))
> return 0;
>
> - oi.typep = &type;
> - if (packed_object_info(the_repository, p, ofs, &oi) < 0)
> - die(_("could not get type of object %s in pack %s"),
> - oid_to_hex(oid), p->pack_name);
> - else if (type == OBJ_COMMIT) {
> - /*
> - * commits in included packs are used as starting points for the
> - * subsequent revision walk
> - */
> - add_pending_oid(revs, NULL, oid, 0);
> + if (p) {
> + struct rev_info *revs = _data;
> + struct object_info oi = OBJECT_INFO_INIT;
> +
> + oi.typep = &type;
> + if (packed_object_info(the_repository, p, ofs, &oi) < 0) {
> + die(_("could not get type of object %s in pack %s"),
> + oid_to_hex(oid), p->pack_name);
> + } else if (type == OBJ_COMMIT) {
> + /*
> + * commits in included packs are used as starting points for the
> + * subsequent revision walk
> + */
> + add_pending_oid(revs, NULL, oid, 0);
> + }
> +
> + stdin_packs_found_nr++;
> }
>
> - stdin_packs_found_nr++;
> -
> create_object_entry(oid, type, 0, 0, 0, p, ofs);
Not rhetorical, since I have no idea: Is the behavior change here to
make create_object_entry with type=OBJ_NONE desired? I.e. do we actually
want to create object entries for OBJ_NONE?
If that is the case I for one would find this a bit easier to follow
like this, even if it has some minor duplication, i.e. the intent is
clearer:
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index ffeaecd1d84..a447f6d5164 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -3202,7 +3202,6 @@ static int add_object_entry_from_pack(const struct object_id *oid,
void *_data)
{
off_t ofs;
- enum object_type type = OBJ_NONE;
display_progress(progress_state, ++nr_seen);
@@ -3216,6 +3215,7 @@ static int add_object_entry_from_pack(const struct object_id *oid,
if (p) {
struct rev_info *revs = _data;
struct object_info oi = OBJECT_INFO_INIT;
+ enum object_type type;
oi.typep = &type;
if (packed_object_info(the_repository, p, ofs, &oi) < 0) {
@@ -3230,9 +3230,11 @@ static int add_object_entry_from_pack(const struct object_id *oid,
}
stdin_packs_found_nr++;
- }
- create_object_entry(oid, type, 0, 0, 0, p, ofs);
+ create_object_entry(oid, type, 0, 0, 0, p, ofs);
+ } else {
+ create_object_entry(oid, OBJ_NONE, 0, 0, 0, p, ofs);
+ }
return 0;
}
Or the same with adding "type = OBJ_NONE" to the "else" branch, leaving
the initial "type" uninitialized"?
Or perhaps this is a bug? I see some OBJ_NONE mentions in the code, but
do packfiles really have "none" objects in some fashion as far as
add_object_entry_from_pack() is concerned? (I'm not familiar enough with
this part of the codebase to know).
next prev parent reply other threads:[~2022-05-24 19:50 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-13 16:23 [PATCH 0/2] pack-objects: fix a pair of MIDX bitmap-related races Taylor Blau
2022-05-13 16:23 ` [PATCH 1/2] pack-bitmap: check preferred pack validity when opening MIDX bitmap Taylor Blau
2022-05-13 18:19 ` Junio C Hamano
2022-05-13 19:55 ` Taylor Blau
2022-05-13 16:23 ` [PATCH 2/2] builtin/pack-objects.c: ensure pack validity from MIDX bitmap objects Taylor Blau
2022-05-13 23:06 ` Jonathan Tan
2022-05-14 13:17 ` Taylor Blau
2022-05-16 6:07 ` Jonathan Tan
2022-05-14 13:34 ` Taylor Blau
2022-05-16 6:11 ` Jonathan Tan
2022-05-24 18:54 ` [PATCH v2 0/4] pack-objects: fix a pair of MIDX bitmap-related races Taylor Blau
2022-05-24 18:54 ` [PATCH v2 1/4] pack-bitmap.c: check preferred pack validity when opening MIDX bitmap Taylor Blau
2022-05-24 19:36 ` Ævar Arnfjörð Bjarmason
2022-05-24 21:38 ` Taylor Blau
2022-05-24 21:51 ` Ævar Arnfjörð Bjarmason
2022-05-24 18:54 ` [PATCH v2 2/4] builtin/pack-objects.c: avoid redundant NULL check Taylor Blau
2022-05-24 21:44 ` Junio C Hamano
2022-05-25 0:11 ` Taylor Blau
2022-05-24 18:54 ` [PATCH v2 3/4] builtin/pack-objects.c: ensure included `--stdin-packs` exist Taylor Blau
2022-05-24 19:46 ` Ævar Arnfjörð Bjarmason [this message]
2022-05-24 21:33 ` Taylor Blau
2022-05-24 21:49 ` Ævar Arnfjörð Bjarmason
2022-05-24 22:03 ` Junio C Hamano
2022-05-25 0:14 ` Taylor Blau
2022-05-26 19:21 ` Victoria Dye
2022-05-26 20:05 ` Taylor Blau
2022-05-24 18:54 ` [PATCH v2 4/4] builtin/pack-objects.c: ensure pack validity from MIDX bitmap objects Taylor Blau
2022-05-24 21:38 ` [PATCH v2 0/4] pack-objects: fix a pair of MIDX bitmap-related races Junio C Hamano
2022-05-25 0:16 ` Taylor Blau
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=220524.86zgj6vhge.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=me@ttaylorr.com \
--cc=vdye@github.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).