From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>,
Michael Haggerty <mhagger@alum.mit.edu>,
Brandon Williams <bmwill@google.com>,
Stefan Beller <sbeller@google.com>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH v3 11/25] builtin/reflog: convert remaining unsigned char uses to object_id
Date: Sun, 15 Oct 2017 22:06:58 +0000 [thread overview]
Message-ID: <20171015220712.97308-12-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20171015220712.97308-1-sandals@crustytoothpaste.net>
Convert the remaining uses of unsigned char [20] to struct object_id.
This conversion is needed for dwim_log.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
builtin/reflog.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 2067cca5b1..302fafbeef 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -42,7 +42,7 @@ struct expire_reflog_policy_cb {
};
struct collected_reflog {
- unsigned char sha1[20];
+ struct object_id oid;
char reflog[FLEX_ARRAY];
};
@@ -385,7 +385,7 @@ static int collect_reflog(const char *ref, const struct object_id *oid, int unus
struct collect_reflog_cb *cb = cb_data;
FLEX_ALLOC_STR(e, reflog, ref);
- hashcpy(e->sha1, oid->hash);
+ oidcpy(&e->oid, oid);
ALLOC_GROW(cb->e, cb->nr + 1, cb->alloc);
cb->e[cb->nr++] = e;
return 0;
@@ -589,7 +589,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
for (i = 0; i < collected.nr; i++) {
struct collected_reflog *e = collected.e[i];
set_reflog_expiry_param(&cb.cmd, explicit_expiry, e->reflog);
- status |= reflog_expire(e->reflog, e->sha1, flags,
+ status |= reflog_expire(e->reflog, e->oid.hash, flags,
reflog_expiry_prepare,
should_expire_reflog_ent,
reflog_expiry_cleanup,
@@ -601,13 +601,13 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
for (; i < argc; i++) {
char *ref;
- unsigned char sha1[20];
- if (!dwim_log(argv[i], strlen(argv[i]), sha1, &ref)) {
+ struct object_id oid;
+ if (!dwim_log(argv[i], strlen(argv[i]), oid.hash, &ref)) {
status |= error("%s points nowhere!", argv[i]);
continue;
}
set_reflog_expiry_param(&cb.cmd, explicit_expiry, ref);
- status |= reflog_expire(ref, sha1, flags,
+ status |= reflog_expire(ref, oid.hash, flags,
reflog_expiry_prepare,
should_expire_reflog_ent,
reflog_expiry_cleanup,
@@ -659,7 +659,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
for ( ; i < argc; i++) {
const char *spec = strstr(argv[i], "@{");
- unsigned char sha1[20];
+ struct object_id oid;
char *ep, *ref;
int recno;
@@ -668,7 +668,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
continue;
}
- if (!dwim_log(argv[i], spec - argv[i], sha1, &ref)) {
+ if (!dwim_log(argv[i], spec - argv[i], oid.hash, &ref)) {
status |= error("no reflog for '%s'", argv[i]);
continue;
}
@@ -683,7 +683,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
cb.cmd.expire_total = 0;
}
- status |= reflog_expire(ref, sha1, flags,
+ status |= reflog_expire(ref, oid.hash, flags,
reflog_expiry_prepare,
should_expire_reflog_ent,
reflog_expiry_cleanup,
--
2.15.0.rc0.271.g36b669edcc
next prev parent reply other threads:[~2017-10-15 22:07 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-15 22:06 [PATCH v3 00/25] object_id part 10 brian m. carlson
2017-10-15 22:06 ` [PATCH v3 01/25] walker: convert to struct object_id brian m. carlson
2017-10-15 22:06 ` [PATCH v3 02/25] refs/files-backend: convert struct ref_to_prune to object_id brian m. carlson
2017-10-15 22:06 ` [PATCH v3 03/25] refs: convert delete_ref and refs_delete_ref to struct object_id brian m. carlson
2017-10-15 22:06 ` [PATCH v3 04/25] refs: convert update_ref and refs_update_ref to use " brian m. carlson
2017-10-15 22:06 ` [PATCH v3 05/25] refs: prevent accidental NULL dereference in write_pseudoref brian m. carlson
2017-10-15 22:06 ` [PATCH v3 06/25] refs: update ref transactions to use struct object_id brian m. carlson
2017-10-15 22:06 ` [PATCH v3 07/25] Convert check_connected " brian m. carlson
2017-10-15 22:06 ` [PATCH v3 08/25] refs: convert resolve_refdup and refs_resolve_refdup to " brian m. carlson
2017-10-15 22:06 ` [PATCH v3 09/25] refs: convert read_ref and read_ref_full to object_id brian m. carlson
2017-10-15 22:06 ` [PATCH v3 10/25] refs: convert dwim_ref and expand_ref to struct object_id brian m. carlson
2017-10-15 22:06 ` brian m. carlson [this message]
2017-10-15 22:06 ` [PATCH v3 12/25] refs: convert dwim_log " brian m. carlson
2017-10-15 22:07 ` [PATCH v3 13/25] pack-bitmap: convert traverse_bitmap_commit_list to object_id brian m. carlson
2017-10-15 22:07 ` [PATCH v3 14/25] builtin/pack-objects: convert to struct object_id brian m. carlson
2017-10-15 22:07 ` [PATCH v3 15/25] refs: convert peel_ref " brian m. carlson
2017-10-15 22:07 ` [PATCH v3 16/25] refs: convert read_ref_at " brian m. carlson
2017-10-15 22:07 ` [PATCH v3 17/25] refs: convert reflog_expire parameter " brian m. carlson
2017-10-15 22:07 ` [PATCH v3 18/25] sha1_file: convert index_path and index_fd " brian m. carlson
2017-10-15 22:07 ` [PATCH v3 19/25] Convert remaining callers of resolve_gitlink_ref to object_id brian m. carlson
2017-10-15 22:07 ` [PATCH v3 20/25] refs: convert resolve_gitlink_ref to struct object_id brian m. carlson
2017-10-15 22:07 ` [PATCH v3 21/25] worktree: convert struct worktree to object_id brian m. carlson
2017-10-15 22:07 ` [PATCH v3 22/25] refs: convert resolve_ref_unsafe to struct object_id brian m. carlson
2017-10-15 22:07 ` [PATCH v3 23/25] refs: convert peel_object " brian m. carlson
2017-10-15 22:07 ` [PATCH v3 24/25] refs: convert read_raw_ref backends " brian m. carlson
2017-10-15 22:07 ` [PATCH v3 25/25] refs/files-backend: convert static functions to object_id brian m. carlson
2017-10-16 2:15 ` [PATCH v3 00/25] object_id part 10 Junio C Hamano
2017-10-16 23:49 ` brian m. carlson
2017-10-16 23:53 ` Kevin Daudt
2017-10-17 1:19 ` 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=20171015220712.97308-12-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.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).