From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: "Michael Haggerty" <mhagger@alum.mit.edu>,
"Jeff King" <peff@peff.net>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 18/53] http-push: convert some static functions to struct object_id
Date: Sun, 23 Apr 2017 21:34:18 +0000 [thread overview]
Message-ID: <20170423213453.253425-19-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20170423213453.253425-1-sandals@crustytoothpaste.net>
Among the functions converted is a caller of lookup_commit_or_die, which
we will convert later on.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
http-push.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/http-push.c b/http-push.c
index f0e3108f7..f3dd0a560 100644
--- a/http-push.c
+++ b/http-push.c
@@ -1536,7 +1536,7 @@ static int remote_exists(const char *path)
return ret;
}
-static void fetch_symref(const char *path, char **symref, unsigned char *sha1)
+static void fetch_symref(const char *path, char **symref, struct object_id *oid)
{
char *url = xstrfmt("%s%s", repo->url, path);
struct strbuf buffer = STRBUF_INIT;
@@ -1549,7 +1549,7 @@ static void fetch_symref(const char *path, char **symref, unsigned char *sha1)
free(*symref);
*symref = NULL;
- hashclr(sha1);
+ oidclr(oid);
if (buffer.len == 0)
return;
@@ -1561,15 +1561,15 @@ static void fetch_symref(const char *path, char **symref, unsigned char *sha1)
if (skip_prefix(buffer.buf, "ref: ", &name)) {
*symref = xmemdupz(name, buffer.len - (name - buffer.buf));
} else {
- get_sha1_hex(buffer.buf, sha1);
+ get_oid_hex(buffer.buf, oid);
}
strbuf_release(&buffer);
}
-static int verify_merge_base(unsigned char *head_sha1, struct ref *remote)
+static int verify_merge_base(struct object_id *head_oid, struct ref *remote)
{
- struct commit *head = lookup_commit_or_die(head_sha1, "HEAD");
+ struct commit *head = lookup_commit_or_die(head_oid->hash, "HEAD");
struct commit *branch = lookup_commit_or_die(remote->old_oid.hash, remote->name);
return in_merge_bases(branch, head);
@@ -1579,7 +1579,7 @@ static int delete_remote_branch(const char *pattern, int force)
{
struct ref *refs = remote_refs;
struct ref *remote_ref = NULL;
- unsigned char head_sha1[20];
+ struct object_id head_oid;
char *symref = NULL;
int match;
int patlen = strlen(pattern);
@@ -1610,7 +1610,7 @@ static int delete_remote_branch(const char *pattern, int force)
* Remote HEAD must be a symref (not exactly foolproof; a remote
* symlink to a symref will look like a symref)
*/
- fetch_symref("HEAD", &symref, head_sha1);
+ fetch_symref("HEAD", &symref, &head_oid);
if (!symref)
return error("Remote HEAD is not a symref");
@@ -1619,7 +1619,7 @@ static int delete_remote_branch(const char *pattern, int force)
if (!strcmp(remote_ref->name, symref))
return error("Remote branch %s is the current HEAD",
remote_ref->name);
- fetch_symref(symref, &symref, head_sha1);
+ fetch_symref(symref, &symref, &head_oid);
}
/* Run extra sanity checks if delete is not forced */
@@ -1627,10 +1627,10 @@ static int delete_remote_branch(const char *pattern, int force)
/* Remote HEAD must resolve to a known object */
if (symref)
return error("Remote HEAD symrefs too deep");
- if (is_null_sha1(head_sha1))
+ if (is_null_oid(&head_oid))
return error("Unable to resolve remote HEAD");
- if (!has_sha1_file(head_sha1))
- return error("Remote HEAD resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", sha1_to_hex(head_sha1));
+ if (!has_object_file(&head_oid))
+ return error("Remote HEAD resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", oid_to_hex(&head_oid));
/* Remote branch must resolve to a known object */
if (is_null_oid(&remote_ref->old_oid))
@@ -1640,7 +1640,7 @@ static int delete_remote_branch(const char *pattern, int force)
return error("Remote branch %s resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", remote_ref->name, oid_to_hex(&remote_ref->old_oid));
/* Remote branch must be an ancestor of remote HEAD */
- if (!verify_merge_base(head_sha1, remote_ref)) {
+ if (!verify_merge_base(&head_oid, remote_ref)) {
return error("The branch '%s' is not an ancestor "
"of your current HEAD.\n"
"If you are sure you want to delete it,"
next prev parent reply other threads:[~2017-04-23 21:36 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-23 21:34 [PATCH 00/53] object_id part 8 brian m. carlson
2017-04-23 21:34 ` [PATCH 01/53] fetch-pack: convert to struct object_id brian m. carlson
2017-04-23 21:34 ` [PATCH 02/53] Clean up outstanding object_id transforms brian m. carlson
2017-04-23 21:34 ` [PATCH 03/53] Convert struct cache_tree to use struct object_id brian m. carlson
2017-04-23 21:34 ` [PATCH 04/53] builtin/name-rev: convert to " brian m. carlson
2017-04-23 21:34 ` [PATCH 05/53] builtin/prune: " brian m. carlson
2017-04-23 21:34 ` [PATCH 06/53] bundle: " brian m. carlson
2017-04-23 21:34 ` [PATCH 07/53] branch: " brian m. carlson
2017-04-23 21:34 ` [PATCH 08/53] builtin/blame: convert static function " brian m. carlson
2017-04-23 21:34 ` [PATCH 09/53] builtin/rev-parse: convert " brian m. carlson
2017-04-23 21:34 ` [PATCH 10/53] fast-import: convert internal structs " brian m. carlson
2017-04-23 21:34 ` [PATCH 11/53] fast-import: convert " brian m. carlson
2017-04-24 17:20 ` Stefan Beller
2017-04-24 23:23 ` brian m. carlson
2017-04-23 21:34 ` [PATCH 12/53] submodule: convert merge_submodule to use " brian m. carlson
2017-04-23 21:34 ` [PATCH 13/53] notes-cache: convert to " brian m. carlson
2017-04-24 22:10 ` Stefan Beller
2017-04-23 21:34 ` [PATCH 14/53] parse-options-cb: " brian m. carlson
2017-04-23 21:34 ` [PATCH 15/53] reflog_expire: " brian m. carlson
2017-04-23 21:34 ` [PATCH 16/53] builtin/verify-commit: " brian m. carlson
2017-04-23 21:34 ` [PATCH 17/53] tag: convert parse_tag_buffer " brian m. carlson
2017-04-23 21:34 ` brian m. carlson [this message]
2017-04-23 21:34 ` [PATCH 19/53] notes-utils: convert internals " brian m. carlson
2017-04-23 21:34 ` [PATCH 20/53] revision: convert prepare_show_merge " brian m. carlson
2017-04-23 21:34 ` [PATCH 21/53] shallow: convert shallow registration functions to object_id brian m. carlson
2017-04-23 21:34 ` [PATCH 22/53] sequencer: convert some functions to struct object_id brian m. carlson
2017-04-23 21:34 ` [PATCH 23/53] builtin/tag: convert " brian m. carlson
2017-04-23 21:34 ` [PATCH 24/53] Convert remaining callers of lookup_commit_reference* to object_id brian m. carlson
2017-04-23 21:34 ` [PATCH 25/53] Convert lookup_commit* to struct object_id brian m. carlson
2017-04-23 21:34 ` [PATCH 26/53] pack: convert struct pack_idx_entry " brian m. carlson
2017-04-23 21:34 ` [PATCH 27/53] builtin/unpack-objects: convert " brian m. carlson
2017-04-23 21:34 ` [PATCH 28/53] Convert remaining callers of lookup_blob to object_id brian m. carlson
2017-04-24 23:05 ` Stefan Beller
2017-04-23 21:34 ` [PATCH 29/53] Convert lookup_blob to struct object_id brian m. carlson
2017-04-23 21:34 ` [PATCH 30/53] tree: convert read_tree_1 to use struct object_id internally brian m. carlson
2017-04-23 21:34 ` [PATCH 31/53] builtin/reflog: convert tree_is_complete to take struct object_id brian m. carlson
2017-04-23 21:34 ` [PATCH 32/53] Convert lookup_tree to " brian m. carlson
2017-04-23 21:34 ` [PATCH 33/53] log-tree: convert " brian m. carlson
2017-04-23 21:34 ` [PATCH 34/53] Convert lookup_tag " brian m. carlson
2017-04-23 21:34 ` [PATCH 35/53] Convert the verify_pack callback " brian m. carlson
2017-04-26 23:01 ` Stefan Beller
2017-04-27 5:52 ` Jeff King
2017-04-28 0:17 ` brian m. carlson
2017-04-28 1:14 ` Jeff King
2017-04-23 21:34 ` [PATCH 36/53] Convert struct ref_array_item " brian m. carlson
2017-04-23 21:34 ` [PATCH 37/53] ref-filter: convert some static functions " brian m. carlson
2017-04-23 21:34 ` [PATCH 38/53] refs: convert struct ref_update to use " brian m. carlson
2017-04-27 4:55 ` Michael Haggerty
2017-04-23 21:34 ` [PATCH 39/53] refs/files-backend: convert many internals to " brian m. carlson
2017-04-27 5:04 ` Michael Haggerty
2017-04-23 21:34 ` [PATCH 40/53] http-push: convert process_ls_object and descendants to object_id brian m. carlson
2017-04-23 21:34 ` [PATCH 41/53] revision: rename add_pending_sha1 to add_pending_oid brian m. carlson
2017-04-23 21:34 ` [PATCH 42/53] revision: convert remaining parse_object callers to object_id brian m. carlson
2017-04-23 21:34 ` [PATCH 43/53] upload-pack: " brian m. carlson
2017-04-23 21:34 ` [PATCH 44/53] sha1_name: convert internals of peel_onion " brian m. carlson
2017-04-23 21:34 ` [PATCH 45/53] builtin/read-tree: convert to struct object_id brian m. carlson
2017-04-23 21:34 ` [PATCH 46/53] builtin/ls-files: convert overlay_tree_on_cache to object_id brian m. carlson
2017-04-23 21:34 ` [PATCH 47/53] sequencer: convert fast_forward_to to struct object_id brian m. carlson
2017-04-23 21:34 ` [PATCH 48/53] merge: convert checkout_fast_forward " brian m. carlson
2017-04-23 21:34 ` [PATCH 49/53] builtin/ls-tree: convert " brian m. carlson
2017-04-23 21:34 ` [PATCH 50/53] diff-lib: convert do_diff_cache " brian m. carlson
2017-04-23 21:34 ` [PATCH 51/53] sequencer: convert do_recursive_merge " brian m. carlson
2017-04-23 21:34 ` [PATCH 52/53] tree: convert parse_tree_indirect " brian m. carlson
2017-04-23 21:34 ` [PATCH 53/53] object: convert parse_object* to take " brian m. carlson
2017-04-27 21:46 ` Stefan Beller
2017-04-24 6:23 ` [PATCH 00/53] object_id part 8 Junio C Hamano
2017-04-24 16:08 ` Brandon Williams
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=20170423213453.253425-19-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=pclouds@gmail.com \
--cc=peff@peff.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).