From: Jonathan Nieder <jrnieder@gmail.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Michael Haggerty <mhagger@alum.mit.edu>,
Brandon Williams <bmwill@google.com>,
Stefan Beller <sbeller@google.com>
Subject: Re: [PATCH v2 05/24] refs: update ref transactions to use struct object_id
Date: Mon, 9 Oct 2017 16:13:04 -0700 [thread overview]
Message-ID: <20171009231304.GI19555@aiede.mtv.corp.google.com> (raw)
In-Reply-To: <20171009011132.675341-6-sandals@crustytoothpaste.net>
brian m. carlson wrote:
> Update the ref transaction code to use struct object_id. Remove one
> NULL pointer check which was previously inserted around a dereference;
> since we now pass a pointer to struct object_id directly through, the
> code we're calling handles this for us.
>
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---
> branch.c | 2 +-
> builtin/clone.c | 2 +-
> builtin/commit.c | 4 ++--
> builtin/fetch.c | 4 ++--
> builtin/receive-pack.c | 4 ++--
> builtin/replace.c | 2 +-
> builtin/tag.c | 2 +-
> builtin/update-ref.c | 8 ++++----
> fast-import.c | 4 ++--
> refs.c | 44 +++++++++++++++++++++-----------------------
> refs.h | 24 ++++++++++++------------
> refs/files-backend.c | 12 ++++++------
> refs/refs-internal.h | 4 ++--
> sequencer.c | 2 +-
> walker.c | 2 +-
> 15 files changed, 59 insertions(+), 61 deletions(-)
Makes sense.
[...]
> +++ b/refs.c
[...]
> int ref_transaction_create(struct ref_transaction *transaction,
> const char *refname,
> - const unsigned char *new_sha1,
> + const struct object_id *new_oid,
> unsigned int flags, const char *msg,
> struct strbuf *err)
> {
> - if (!new_sha1 || is_null_sha1(new_sha1))
> + if (!new_oid || is_null_oid(new_oid))
> die("BUG: create called without valid new_sha1");
The error message still refers to new_sha1.
[...]
> int ref_transaction_delete(struct ref_transaction *transaction,
> const char *refname,
> - const unsigned char *old_sha1,
> + const struct object_id *old_oid,
> unsigned int flags, const char *msg,
> struct strbuf *err)
> {
> - if (old_sha1 && is_null_sha1(old_sha1))
> + if (old_oid && is_null_oid(old_oid))
> die("BUG: delete called with old_sha1 set to zeros");
Likewise.
[...]
> int ref_transaction_verify(struct ref_transaction *transaction,
> const char *refname,
> - const unsigned char *old_sha1,
> + const struct object_id *old_oid,
> unsigned int flags,
> struct strbuf *err)
> {
> - if (!old_sha1)
> + if (!old_oid)
> die("BUG: verify called with old_sha1 set to NULL");
Likewise.
[...]
> +++ b/refs.h
> @@ -519,15 +519,15 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err);
[...]
> /*
> - * Add a reference creation to transaction. new_sha1 is the value that
> + * Add a reference creation to transaction. new_oid is the value that
> * the reference should have after the update; it must not be
> - * null_sha1. It is verified that the reference does not exist
> + * null_oid. It is verified that the reference does not exist
> * already.
> *
> * See the above comment "Reference transaction updates" for more
> @@ -535,35 +535,35 @@ int ref_transaction_update(struct ref_transaction *transaction,
> */
(Possible diff generation bug: there's exactly one line represented in
that @@ field. I would have expected the diff generator to combine
the hunks.)
I think this is fine to go in without the error messages being fixed.
A grep for 'sha1' will find them later so that they can be addressed
in a separate patch.
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
next prev parent reply other threads:[~2017-10-09 23:13 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-09 1:11 [PATCH v2 00/24] object_id part 10 brian m. carlson
2017-10-09 1:11 ` [PATCH v2 01/24] walker: convert to struct object_id brian m. carlson
2017-10-09 22:37 ` Jonathan Nieder
2017-10-09 1:11 ` [PATCH v2 02/24] refs/files-backend: convert struct ref_to_prune to object_id brian m. carlson
2017-10-09 22:38 ` Jonathan Nieder
2017-10-09 1:11 ` [PATCH v2 03/24] refs: convert delete_ref and refs_delete_ref to struct object_id brian m. carlson
2017-10-09 22:43 ` Jonathan Nieder
2017-10-09 1:11 ` [PATCH v2 04/24] refs: convert update_ref and refs_update_ref to use " brian m. carlson
2017-10-09 22:57 ` Jonathan Nieder
2017-10-11 6:33 ` Michael Haggerty
2017-10-12 8:42 ` brian m. carlson
2017-10-09 1:11 ` [PATCH v2 05/24] refs: update ref transactions " brian m. carlson
2017-10-09 23:13 ` Jonathan Nieder [this message]
2017-10-11 6:58 ` Michael Haggerty
2017-10-09 1:11 ` [PATCH v2 06/24] Convert check_connected " brian m. carlson
2017-10-09 23:20 ` Jonathan Nieder
2017-10-09 1:11 ` [PATCH v2 07/24] refs: convert resolve_refdup and refs_resolve_refdup to " brian m. carlson
2017-10-09 23:36 ` Jonathan Nieder
2017-10-10 1:16 ` Junio C Hamano
2017-10-09 1:11 ` [PATCH v2 08/24] refs: convert read_ref and read_ref_full to object_id brian m. carlson
2017-10-10 1:35 ` Jonathan Nieder
2017-10-09 1:11 ` [PATCH v2 09/24] refs: convert dwim_ref and expand_ref to struct object_id brian m. carlson
2017-10-10 2:03 ` Jonathan Nieder
2017-10-09 1:11 ` [PATCH v2 10/24] builtin/reflog: convert remaining unsigned char uses to object_id brian m. carlson
2017-10-10 2:15 ` Jonathan Nieder
2017-10-09 1:11 ` [PATCH v2 11/24] refs: convert dwim_log to struct object_id brian m. carlson
2017-10-10 2:18 ` Jonathan Nieder
2017-10-09 1:11 ` [PATCH v2 12/24] pack-bitmap: convert traverse_bitmap_commit_list to object_id brian m. carlson
2017-10-10 2:19 ` Jonathan Nieder
2017-10-09 1:11 ` [PATCH v2 13/24] builtin/pack-objects: convert to struct object_id brian m. carlson
2017-10-10 2:24 ` Jonathan Nieder
2017-10-09 1:11 ` [PATCH v2 14/24] refs: convert peel_ref " brian m. carlson
2017-10-11 8:00 ` Michael Haggerty
2017-10-09 1:11 ` [PATCH v2 15/24] refs: convert read_ref_at " brian m. carlson
2017-10-09 1:11 ` [PATCH v2 16/24] refs: convert reflog_expire parameter " brian m. carlson
2017-10-09 1:11 ` [PATCH v2 17/24] sha1_file: convert index_path and index_fd " brian m. carlson
2017-10-09 1:11 ` [PATCH v2 18/24] Convert remaining callers of resolve_gitlink_ref to object_id brian m. carlson
2017-10-09 1:11 ` [PATCH v2 19/24] refs: convert resolve_gitlink_ref to struct object_id brian m. carlson
2017-10-09 1:11 ` [PATCH v2 20/24] worktree: convert struct worktree to object_id brian m. carlson
2017-10-09 1:11 ` [PATCH v2 21/24] refs: convert resolve_ref_unsafe to struct object_id brian m. carlson
2017-10-11 8:23 ` Michael Haggerty
2017-10-09 1:11 ` [PATCH v2 22/24] refs: convert peel_object " brian m. carlson
2017-10-09 1:11 ` [PATCH v2 23/24] refs: convert read_raw_ref backends " brian m. carlson
2017-10-11 8:30 ` Michael Haggerty
2017-10-09 1:11 ` [PATCH v2 24/24] refs/files-backend: convert static functions to object_id brian m. carlson
2017-10-11 8:36 ` Michael Haggerty
2017-10-09 18:00 ` [PATCH v2 00/24] object_id part 10 Stefan Beller
2017-10-09 22:44 ` Junio C Hamano
2017-10-11 10:05 ` Michael Haggerty
2017-10-11 10:42 ` Junio C Hamano
2017-10-12 8:46 ` brian m. carlson
2017-10-12 9:58 ` Junio C Hamano
2017-10-12 10:22 ` 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=20171009231304.GI19555@aiede.mtv.corp.google.com \
--to=jrnieder@gmail.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
--cc=sbeller@google.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).