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>
Subject: [PATCH v3 00/19] object_id part 6
Date: Sat, 18 Feb 2017 00:06:33 +0000 [thread overview]
Message-ID: <20170218000652.375129-1-sandals@crustytoothpaste.net> (raw)
This is another series in the continuing conversion to struct object_id.
This series converts more of the builtin directory and some of the refs
code to use struct object_id. Additionally, it implements an
nth_packed_object_oid function which provides a struct object_id version
of the nth_packed_object function, and a parse_oid_hex function that
makes parsing easier.
The patch to use parse_oid_hex in the refs code has been split out into
its own patch, just because I'm wary of that code and potentially
breaking things, and I want it to be easy to revert in case things go
wrong. I have no reason to believe it is anything other than fully
functional, however.
The conflicts in pu with v2 are probably still present, but I expect the
resolution should be easy (and I suspect Junio uses git rerere, so they'll be
even easier).
Changes from v2:
* Fix misnamed function in commit message.
* Improve parameter name of parse_oid_hex.
* Improve docstring of parse_oid_hex.
* Remove needless variable.
* Rebase on master.
Changes from v1:
* Implement parse_oid_hex and use it.
* Make nth_packed_object_oid take a variable into which to store the
object ID. This avoids concerns about unsafe casts.
* Rebase on master.
brian m. carlson (19):
builtin/commit: convert to struct object_id
builtin/diff-tree: convert to struct object_id
builtin/describe: convert to struct object_id
builtin/fast-export: convert to struct object_id
builtin/fmt-merge-message: convert to struct object_id
builtin/grep: convert to struct object_id
builtin/branch: convert to struct object_id
builtin/clone: convert to struct object_id
builtin/merge: convert to struct object_id
Convert remaining callers of resolve_refdup to object_id
builtin/replace: convert to struct object_id
reflog-walk: convert struct reflog_info to struct object_id
refs: convert each_reflog_ent_fn to struct object_id
hex: introduce parse_oid_hex
refs: simplify parsing of reflog entries
sha1_file: introduce an nth_packed_object_oid function
Convert object iteration callbacks to struct object_id
builtin/merge-base: convert to struct object_id
wt-status: convert to struct object_id
builtin/branch.c | 26 +++++-----
builtin/cat-file.c | 8 +--
builtin/clone.c | 10 ++--
builtin/commit.c | 46 ++++++++---------
builtin/count-objects.c | 4 +-
builtin/describe.c | 50 +++++++++---------
builtin/diff-tree.c | 38 +++++++-------
builtin/fast-export.c | 58 ++++++++++-----------
builtin/fmt-merge-msg.c | 70 ++++++++++++-------------
builtin/fsck.c | 40 +++++++--------
builtin/grep.c | 24 ++++-----
builtin/merge-base.c | 30 +++++------
builtin/merge.c | 134 ++++++++++++++++++++++++------------------------
builtin/notes.c | 18 +++----
builtin/pack-objects.c | 6 +--
builtin/prune-packed.c | 4 +-
builtin/prune.c | 8 +--
builtin/receive-pack.c | 4 +-
builtin/reflog.c | 2 +-
builtin/replace.c | 112 ++++++++++++++++++++--------------------
cache.h | 19 ++++++-
hex.c | 8 +++
reachable.c | 30 +++++------
ref-filter.c | 4 +-
reflog-walk.c | 26 +++++-----
refs.c | 24 ++++-----
refs.h | 2 +-
refs/files-backend.c | 29 ++++++-----
revision.c | 12 ++---
sha1_file.c | 27 +++++++---
sha1_name.c | 2 +-
transport.c | 4 +-
wt-status.c | 52 +++++++++----------
33 files changed, 483 insertions(+), 448 deletions(-)
--
2.11.0
next reply other threads:[~2017-02-18 0:07 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-18 0:06 brian m. carlson [this message]
2017-02-18 0:06 ` [PATCH v3 01/19] builtin/commit: convert to struct object_id brian m. carlson
2017-02-18 0:06 ` [PATCH v3 02/19] builtin/diff-tree: " brian m. carlson
2017-02-18 1:18 ` Ramsay Jones
2017-02-18 1:26 ` brian m. carlson
2017-02-18 1:42 ` Jeff King
2017-02-18 3:15 ` Jeff King
2017-02-18 19:12 ` brian m. carlson
2017-02-18 20:01 ` Jeff King
2017-02-18 0:06 ` [PATCH v3 03/19] builtin/describe: " brian m. carlson
2017-02-18 0:06 ` [PATCH v3 04/19] builtin/fast-export: " brian m. carlson
2017-02-18 0:06 ` [PATCH v3 05/19] builtin/fmt-merge-message: " brian m. carlson
2017-02-18 0:06 ` [PATCH v3 06/19] builtin/grep: " brian m. carlson
2017-02-18 0:06 ` [PATCH v3 07/19] builtin/branch: " brian m. carlson
2017-02-18 0:06 ` [PATCH v3 08/19] builtin/clone: " brian m. carlson
2017-02-18 0:06 ` [PATCH v3 09/19] builtin/merge: " brian m. carlson
2017-02-18 0:06 ` [PATCH v3 10/19] Convert remaining callers of resolve_refdup to object_id brian m. carlson
2017-02-18 0:06 ` [PATCH v3 11/19] builtin/replace: convert to struct object_id brian m. carlson
2017-02-18 0:06 ` [PATCH v3 12/19] reflog-walk: convert struct reflog_info " brian m. carlson
2017-02-18 0:06 ` [PATCH v3 13/19] refs: convert each_reflog_ent_fn " brian m. carlson
2017-02-18 0:06 ` [PATCH v3 14/19] hex: introduce parse_oid_hex brian m. carlson
2017-02-18 0:06 ` [PATCH v3 15/19] refs: simplify parsing of reflog entries brian m. carlson
2017-02-18 0:06 ` [PATCH v3 16/19] sha1_file: introduce an nth_packed_object_oid function brian m. carlson
2017-02-18 1:24 ` Ramsay Jones
2017-02-18 1:29 ` brian m. carlson
2017-02-18 0:06 ` [PATCH v3 17/19] Convert object iteration callbacks to struct object_id brian m. carlson
2017-02-18 0:06 ` [PATCH v3 18/19] builtin/merge-base: convert " brian m. carlson
2017-02-18 0:06 ` [PATCH v3 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=20170218000652.375129-1-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 \
/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