All of lore.kernel.org
 help / color / mirror / Atom feed
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 13/19] reflog-walk: convert struct reflog_info to struct object_id
Date: Mon, 20 Feb 2017 00:10:25 +0000	[thread overview]
Message-ID: <20170220001031.559931-14-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20170220001031.559931-1-sandals@crustytoothpaste.net>

Convert struct reflog_info to use struct object_id by changing the
structure definition and applying the following semantic patch:

@@
struct reflog_info E1;
@@
- E1.osha1
+ E1.ooid.hash

@@
struct reflog_info *E1;
@@
- E1->osha1
+ E1->ooid.hash

@@
struct reflog_info E1;
@@
- E1.nsha1
+ E1.noid.hash

@@
struct reflog_info *E1;
@@
- E1->nsha1
+ E1->noid.hash

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 reflog-walk.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/reflog-walk.c b/reflog-walk.c
index f98748e2ae..fe5be41471 100644
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -10,7 +10,7 @@ struct complete_reflogs {
 	char *ref;
 	const char *short_ref;
 	struct reflog_info {
-		unsigned char osha1[20], nsha1[20];
+		struct object_id ooid, noid;
 		char *email;
 		unsigned long timestamp;
 		int tz;
@@ -28,8 +28,8 @@ static int read_one_reflog(unsigned char *osha1, unsigned char *nsha1,
 
 	ALLOC_GROW(array->items, array->nr + 1, array->alloc);
 	item = array->items + array->nr;
-	hashcpy(item->osha1, osha1);
-	hashcpy(item->nsha1, nsha1);
+	hashcpy(item->ooid.hash, osha1);
+	hashcpy(item->noid.hash, nsha1);
 	item->email = xstrdup(email);
 	item->timestamp = timestamp;
 	item->tz = tz;
@@ -238,13 +238,13 @@ void fake_reflog_parent(struct reflog_walk_info *info, struct commit *commit)
 	do {
 		reflog = &commit_reflog->reflogs->items[commit_reflog->recno];
 		commit_reflog->recno--;
-		logobj = parse_object(reflog->osha1);
+		logobj = parse_object(reflog->ooid.hash);
 	} while (commit_reflog->recno && (logobj && logobj->type != OBJ_COMMIT));
 
-	if (!logobj && commit_reflog->recno >= 0 && is_null_sha1(reflog->osha1)) {
+	if (!logobj && commit_reflog->recno >= 0 && is_null_sha1(reflog->ooid.hash)) {
 		/* a root commit, but there are still more entries to show */
 		reflog = &commit_reflog->reflogs->items[commit_reflog->recno];
-		logobj = parse_object(reflog->nsha1);
+		logobj = parse_object(reflog->noid.hash);
 	}
 
 	if (!logobj || logobj->type != OBJ_COMMIT) {
-- 
2.11.0


  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 ` [PATCH v4 09/19] builtin/clone: " brian m. carlson
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 ` brian m. carlson [this message]
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-14-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.