git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Martin Ågren" <martin.agren@gmail.com>,
	"Eric Sunshine" <sunshine@sunshineco.com>,
	git@vger.kernel.org, "Michael Haggerty" <mhagger@alum.mit.edu>
Subject: [PATCH v2 8/9] write_packed_entry(): take `object_id` arguments
Date: Sun,  5 Nov 2017 09:42:08 +0100	[thread overview]
Message-ID: <e397d73256373c319ff79b16ef5fb4a4813d8ff9.1509870243.git.mhagger@alum.mit.edu> (raw)
In-Reply-To: <cover.1509870243.git.mhagger@alum.mit.edu>

Change `write_packed_entry()` to take `struct object_id *` rather than
`unsigned char *` arguments.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 refs/packed-backend.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index 74f1dea0f4..43ad74fc5a 100644
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -961,11 +961,11 @@ static struct ref_iterator *packed_ref_iterator_begin(
  * by the failing call to `fprintf()`.
  */
 static int write_packed_entry(FILE *fh, const char *refname,
-			      const unsigned char *sha1,
-			      const unsigned char *peeled)
+			      const struct object_id *oid,
+			      const struct object_id *peeled)
 {
-	if (fprintf(fh, "%s %s\n", sha1_to_hex(sha1), refname) < 0 ||
-	    (peeled && fprintf(fh, "^%s\n", sha1_to_hex(peeled)) < 0))
+	if (fprintf(fh, "%s %s\n", oid_to_hex(oid), refname) < 0 ||
+	    (peeled && fprintf(fh, "^%s\n", oid_to_hex(peeled)) < 0))
 		return -1;
 
 	return 0;
@@ -1203,8 +1203,8 @@ static int write_with_updates(struct packed_ref_store *refs,
 			int peel_error = ref_iterator_peel(iter, &peeled);
 
 			if (write_packed_entry(out, iter->refname,
-					       iter->oid->hash,
-					       peel_error ? NULL : peeled.hash))
+					       iter->oid,
+					       peel_error ? NULL : &peeled))
 				goto write_error;
 
 			if ((ok = ref_iterator_advance(iter)) != ITER_OK)
@@ -1224,8 +1224,8 @@ static int write_with_updates(struct packed_ref_store *refs,
 						     &peeled);
 
 			if (write_packed_entry(out, update->refname,
-					       update->new_oid.hash,
-					       peel_error ? NULL : peeled.hash))
+					       &update->new_oid,
+					       peel_error ? NULL : &peeled))
 				goto write_error;
 
 			i++;
-- 
2.14.1


  parent reply	other threads:[~2017-11-05  8:42 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-05  8:42 [PATCH v2 0/9] Tidy up the constants related to ref_update::flags Michael Haggerty
2017-11-05  8:42 ` [PATCH v2 1/9] files_transaction_prepare(): don't leak flags to packed transaction Michael Haggerty
2017-11-05  8:42 ` [PATCH v2 2/9] prune_ref(): call `ref_transaction_add_update()` directly Michael Haggerty
2017-11-05  8:42 ` [PATCH v2 3/9] ref_transaction_update(): die on disallowed flags Michael Haggerty
2017-11-07 20:53   ` Martin Ågren
2017-11-07 22:07     ` Thomas Gummerer
2017-11-05  8:42 ` [PATCH v2 4/9] ref_transaction_add_update(): remove a check Michael Haggerty
2017-11-05  8:42 ` [PATCH v2 5/9] refs: tidy up and adjust visibility of the `ref_update` flags Michael Haggerty
2017-11-05  8:42 ` [PATCH v2 6/9] refs: rename constant `REF_NODEREF` to `REF_NO_DEREF` Michael Haggerty
2017-11-05  8:42 ` [PATCH v2 7/9] refs: rename constant `REF_ISPRUNING` to `REF_IS_PRUNING` Michael Haggerty
2017-11-05  8:42 ` Michael Haggerty [this message]
2017-11-05  8:42 ` [PATCH v2 9/9] refs: update some more docs to use "oid" rather than "sha1" Michael Haggerty

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=e397d73256373c319ff79b16ef5fb4a4813d8ff9.1509870243.git.mhagger@alum.mit.edu \
    --to=mhagger@alum.mit.edu \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=martin.agren@gmail.com \
    --cc=sunshine@sunshineco.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).