From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: Brandon Williams <bmwill@google.com>,
Stefan Beller <stefanbeller@gmail.com>, Jeff King <peff@peff.net>
Subject: [PATCH 04/12] remote: convert struct push_cas to struct object_id
Date: Mon, 3 Jul 2017 18:55:25 +0000 [thread overview]
Message-ID: <20170703185533.51530-5-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20170703185533.51530-1-sandals@crustytoothpaste.net>
This gets rid of one use of get_sha1.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
remote.c | 6 +++---
remote.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/remote.c b/remote.c
index d87482573..9da9040bf 100644
--- a/remote.c
+++ b/remote.c
@@ -2294,8 +2294,8 @@ static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, i
if (!*colon)
entry->use_tracking = 1;
else if (!colon[1])
- hashclr(entry->expect);
- else if (get_sha1(colon + 1, entry->expect))
+ oidclr(&entry->expect);
+ else if (get_oid(colon + 1, &entry->expect))
return error("cannot parse expected object name '%s'", colon + 1);
return 0;
}
@@ -2342,7 +2342,7 @@ static void apply_cas(struct push_cas_option *cas,
continue;
ref->expect_old_sha1 = 1;
if (!entry->use_tracking)
- hashcpy(ref->old_oid_expect.hash, cas->entry[i].expect);
+ oidcpy(&ref->old_oid_expect, &entry->expect);
else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
oidclr(&ref->old_oid_expect);
return;
diff --git a/remote.h b/remote.h
index 6c28cd3e4..2ecf4c8c7 100644
--- a/remote.h
+++ b/remote.h
@@ -282,7 +282,7 @@ struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fet
struct push_cas_option {
unsigned use_tracking_for_rest:1;
struct push_cas {
- unsigned char expect[20];
+ struct object_id expect;
unsigned use_tracking:1;
char *refname;
} *entry;
next prev parent reply other threads:[~2017-07-03 18:55 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-03 18:55 [PATCH 00/12] object_id part 9 brian m. carlson
2017-07-03 18:55 ` [PATCH 01/12] builtin/fsck: convert remaining caller of get_sha1 to object_id brian m. carlson
2017-07-03 18:55 ` [PATCH 02/12] builtin/merge-tree: " brian m. carlson
2017-07-03 18:55 ` [PATCH 03/12] submodule: convert submodule config lookup to use object_id brian m. carlson
2017-07-03 18:55 ` brian m. carlson [this message]
2017-07-03 18:55 ` [PATCH 05/12] sequencer: convert to struct object_id brian m. carlson
2017-07-03 18:55 ` [PATCH 06/12] builtin/update_ref: " brian m. carlson
2017-07-03 20:49 ` Ævar Arnfjörð Bjarmason
2017-07-04 14:45 ` brian m. carlson
2017-07-03 18:55 ` [PATCH 07/12] bisect: convert bisect_checkout " brian m. carlson
2017-07-03 18:55 ` [PATCH 08/12] builtin/unpack-file: convert " brian m. carlson
2017-07-03 18:55 ` [PATCH 09/12] builtin/verify-tag: " brian m. carlson
2017-07-03 18:55 ` [PATCH 10/12] Convert remaining callers of get_sha1 to get_oid brian m. carlson
2017-07-03 18:55 ` [PATCH 11/12] sha1_name: convert get_sha1* to get_oid* brian m. carlson
2017-07-05 18:01 ` Stefan Beller
2017-07-05 18:38 ` Junio C Hamano
2017-07-07 21:22 ` brian m. carlson
2017-07-03 18:55 ` [PATCH 12/12] sha1_name: convert GET_SHA1* flags to GET_OID* brian m. carlson
2017-07-05 4:10 ` [PATCH 00/12] object_id part 9 Junio C Hamano
2017-07-05 18:02 ` Stefan Beller
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=20170703185533.51530-5-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=stefanbeller@gmail.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).