From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>,
Michael Haggerty <mhagger@alum.mit.edu>,
Junio C Hamano <gitster@pobox.com>,
Ramsay Jones <ramsay@ramsayjones.plus.com>
Subject: [PATCH v4 09/19] builtin/clone: convert to struct object_id
Date: Mon, 20 Feb 2017 00:10:21 +0000 [thread overview]
Message-ID: <20170220001031.559931-10-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20170220001031.559931-1-sandals@crustytoothpaste.net>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
builtin/clone.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c
index 3f63edbbf9..b4c929bb8a 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -681,7 +681,7 @@ static void update_head(const struct ref *our, const struct ref *remote,
static int checkout(int submodule_progress)
{
- unsigned char sha1[20];
+ struct object_id oid;
char *head;
struct lock_file *lock_file;
struct unpack_trees_options opts;
@@ -692,7 +692,7 @@ static int checkout(int submodule_progress)
if (option_no_checkout)
return 0;
- head = resolve_refdup("HEAD", RESOLVE_REF_READING, sha1, NULL);
+ head = resolve_refdup("HEAD", RESOLVE_REF_READING, oid.hash, NULL);
if (!head) {
warning(_("remote HEAD refers to nonexistent ref, "
"unable to checkout.\n"));
@@ -700,7 +700,7 @@ static int checkout(int submodule_progress)
}
if (!strcmp(head, "HEAD")) {
if (advice_detached_head)
- detach_advice(sha1_to_hex(sha1));
+ detach_advice(oid_to_hex(&oid));
} else {
if (!starts_with(head, "refs/heads/"))
die(_("HEAD not found below refs/heads!"));
@@ -721,7 +721,7 @@ static int checkout(int submodule_progress)
opts.src_index = &the_index;
opts.dst_index = &the_index;
- tree = parse_tree_indirect(sha1);
+ tree = parse_tree_indirect(oid.hash);
parse_tree(tree);
init_tree_desc(&t, tree->buffer, tree->size);
if (unpack_trees(1, &t, &opts) < 0)
@@ -731,7 +731,7 @@ static int checkout(int submodule_progress)
die(_("unable to write new index file"));
err |= run_hook_le(NULL, "post-checkout", sha1_to_hex(null_sha1),
- sha1_to_hex(sha1), "1", NULL);
+ oid_to_hex(&oid), "1", NULL);
if (!err && option_recursive) {
struct argv_array args = ARGV_ARRAY_INIT;
--
2.11.0
next prev parent reply other threads:[~2017-02-20 0:11 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-20 0:10 [PATCH v4 00/19] object_id part 6 brian m. carlson
2017-02-20 0:10 ` [PATCH v4 01/19] hex: introduce parse_oid_hex brian m. carlson
2017-02-20 0:10 ` [PATCH v4 02/19] builtin/commit: convert to struct object_id brian m. carlson
2017-02-20 0:10 ` [PATCH v4 03/19] builtin/diff-tree: " brian m. carlson
2017-02-20 8:09 ` Jeff King
2017-02-21 0:25 ` brian m. carlson
2017-02-21 1:08 ` Jeff King
2017-02-21 1:10 ` brian m. carlson
2017-02-20 0:10 ` [PATCH v4 04/19] builtin/describe: " brian m. carlson
2017-02-20 0:10 ` [PATCH v4 05/19] builtin/fast-export: " brian m. carlson
2017-02-20 0:10 ` [PATCH v4 06/19] builtin/fmt-merge-message: " brian m. carlson
2017-02-20 0:10 ` [PATCH v4 07/19] builtin/grep: " brian m. carlson
2017-02-20 0:10 ` [PATCH v4 08/19] builtin/branch: " brian m. carlson
2017-02-20 0:10 ` brian m. carlson [this message]
2017-02-20 0:10 ` [PATCH v4 10/19] builtin/merge: " brian m. carlson
2017-02-20 0:10 ` [PATCH v4 11/19] Convert remaining callers of resolve_refdup to object_id brian m. carlson
2017-02-20 0:10 ` [PATCH v4 12/19] builtin/replace: convert to struct object_id brian m. carlson
2017-02-20 0:10 ` [PATCH v4 13/19] reflog-walk: convert struct reflog_info " brian m. carlson
2017-02-20 0:10 ` [PATCH v4 14/19] refs: convert each_reflog_ent_fn " brian m. carlson
2017-02-20 0:10 ` [PATCH v4 15/19] refs: simplify parsing of reflog entries brian m. carlson
2017-02-20 0:10 ` [PATCH v4 16/19] sha1_file: introduce an nth_packed_object_oid function brian m. carlson
2017-02-20 0:10 ` [PATCH v4 17/19] Convert object iteration callbacks to struct object_id brian m. carlson
2017-02-20 0:10 ` [PATCH v4 18/19] builtin/merge-base: convert " brian m. carlson
2017-02-20 0:10 ` [PATCH v4 19/19] wt-status: " 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170220001031.559931-10-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox