From: Stefan Beller <sbeller@google.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
Jeff King <peff@peff.net>,
Michael Haggerty <mhagger@alum.mit.edu>,
Brandon Williams <bmwill@google.com>
Subject: Re: [PATCH 06/24] Convert check_connected to use struct object_id
Date: Mon, 2 Oct 2017 16:00:54 -0700 [thread overview]
Message-ID: <CAGZ79kb1WjUUKV5aUoPf=x=nFqMhJssKudtHm+_LxY5=ky6r4A@mail.gmail.com> (raw)
In-Reply-To: <20171001220831.214705-7-sandals@crustytoothpaste.net>
On Sun, Oct 1, 2017 at 3:08 PM, brian m. carlson
<sandals@crustytoothpaste.net> wrote:
> Convert check_connected and the callbacks it takes to use struct
> object_id.
>
> diff --git a/connected.c b/connected.c
> index f416b05051..4a47f33270 100644
> --- a/connected.c
> +++ b/connected.c
> @@ -16,13 +16,13 @@
> *
> * Returns 0 if everything is connected, non-zero otherwise.
> */
> -int check_connected(sha1_iterate_fn fn, void *cb_data,
> +int check_connected(oid_iterate_fn fn, void *cb_data,
> struct check_connected_options *opt)
> {
> struct child_process rev_list = CHILD_PROCESS_INIT;
> struct check_connected_options defaults = CHECK_CONNECTED_INIT;
> - char commit[41];
> - unsigned char sha1[20];
> + char commit[GIT_MAX_HEXSZ + 1];
> + struct object_id oid;
> int err = 0;
> struct packed_git *new_pack = NULL;
> struct transport *transport;
> @@ -77,7 +77,7 @@ int check_connected(sha1_iterate_fn fn, void *cb_data,
>
> sigchain_push(SIGPIPE, SIG_IGN);
>
> - commit[40] = '\n';
> + commit[GIT_SHA1_HEXSZ] = '\n';
While we are using SHA1, this and below is correctly using
GIT_SHA1_HEXSZ, but the array is defined as GIT_MAX_HEXSZ.
Upon switching the hash function, we would plug in the
GIT_NEWHASH_HEXSZ here, or if we do it dynamically
(using a vtable for hash functions, to switch at run time)
we'd need to make the decision based on the hash function.
Makes sense.
> do {
> /*
> * If index-pack already checked that:
> @@ -87,17 +87,17 @@ int check_connected(sha1_iterate_fn fn, void *cb_data,
> * are sure the ref is good and not sending it to
> * rev-list for verification.
> */
> - if (new_pack && find_pack_entry_one(sha1, new_pack))
> + if (new_pack && find_pack_entry_one(oid.hash, new_pack))
> continue;
>
> - memcpy(commit, sha1_to_hex(sha1), 40);
> - if (write_in_full(rev_list.in, commit, 41) < 0) {
> + memcpy(commit, oid_to_hex(&oid), GIT_SHA1_HEXSZ);
> + if (write_in_full(rev_list.in, commit, GIT_SHA1_HEXSZ + 1) < 0) {
> if (errno != EPIPE && errno != EINVAL)
> error_errno(_("failed write to rev-list"));
> err = -1;
> break;
> }
next prev parent reply other threads:[~2017-10-02 23:00 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-01 22:08 [PATCH 00/24] object_id part 10 brian m. carlson
2017-10-01 22:08 ` [PATCH 01/24] walker: convert to struct object_id brian m. carlson
2017-10-01 22:08 ` [PATCH 02/24] refs/files-backend: convert struct ref_to_prune to object_id brian m. carlson
2017-10-01 22:08 ` [PATCH 03/24] refs: convert delete_ref and refs_delete_ref to struct object_id brian m. carlson
2017-10-01 22:08 ` [PATCH 04/24] refs: convert update_ref and refs_update_ref to use " brian m. carlson
2017-10-02 22:37 ` Stefan Beller
2017-10-03 1:23 ` brian m. carlson
2017-10-02 23:08 ` Brandon Williams
2017-10-01 22:08 ` [PATCH 05/24] refs: update ref transactions " brian m. carlson
2017-10-01 22:08 ` [PATCH 06/24] Convert check_connected " brian m. carlson
2017-10-02 23:00 ` Stefan Beller [this message]
2017-10-01 22:08 ` [PATCH 07/24] refs: convert resolve_refdup and refs_resolve_refdup to " brian m. carlson
2017-10-01 22:08 ` [PATCH 08/24] refs: convert read_ref and read_ref_full to object_id brian m. carlson
2017-10-01 22:08 ` [PATCH 09/24] refs: convert dwim_ref and expand_ref to struct object_id brian m. carlson
2017-10-01 22:08 ` [PATCH 10/24] builtin/reflog: convert remaining unsigned char uses to object_id brian m. carlson
2017-10-01 22:08 ` [PATCH 11/24] refs: convert dwim_log to struct object_id brian m. carlson
2017-10-01 22:08 ` [PATCH 12/24] pack-bitmap: convert traverse_bitmap_commit_list to object_id brian m. carlson
2017-10-01 22:08 ` [PATCH 13/24] builtin/pack-objects: convert to struct object_id brian m. carlson
2017-10-02 23:20 ` Stefan Beller
2017-10-01 22:08 ` [PATCH 14/24] refs: convert peel_ref " brian m. carlson
2017-10-01 22:08 ` [PATCH 15/24] refs: convert read_ref_at " brian m. carlson
2017-10-02 23:26 ` Brandon Williams
2017-10-01 22:08 ` [PATCH 16/24] refs: convert reflog_expire parameter " brian m. carlson
2017-10-01 22:08 ` [PATCH 17/24] sha1_file: convert index_path and index_fd " brian m. carlson
2017-10-01 22:08 ` [PATCH 18/24] Convert remaining callers of resolve_gitlink_ref to object_id brian m. carlson
2017-10-01 22:08 ` [PATCH 19/24] refs: convert resolve_gitlink_ref to struct object_id brian m. carlson
2017-10-01 22:08 ` [PATCH 20/24] worktree: convert struct worktree to object_id brian m. carlson
2017-10-01 22:08 ` [PATCH 21/24] refs: convert resolve_ref_unsafe to struct object_id brian m. carlson
2017-10-01 22:08 ` [PATCH 22/24] refs: convert peel_object " brian m. carlson
2017-10-01 22:08 ` [PATCH 23/24] refs: convert read_raw_ref backends " brian m. carlson
2017-10-01 22:08 ` [PATCH 24/24] refs/files-backend: convert static functions to object_id brian m. carlson
2017-10-02 23:34 ` [PATCH 00/24] object_id part 10 Brandon Williams
2017-10-02 23:34 ` Stefan Beller
2017-10-03 1:43 ` brian m. carlson
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='CAGZ79kb1WjUUKV5aUoPf=x=nFqMhJssKudtHm+_LxY5=ky6r4A@mail.gmail.com' \
--to=sbeller@google.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.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).