From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: "Jeff King" <peff@peff.net>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Michael Haggerty" <mhagger@alum.mit.edu>
Subject: [PATCH v2 00/10] object_id part 2
Date: Sat, 13 Jun 2015 22:16:33 +0000 [thread overview]
Message-ID: <1434233803-422442-1-git-send-email-sandals@crustytoothpaste.net> (raw)
This is another series of conversions to struct object_id.
This series converts more of the refs code and struct object to use
struct object_id. It introduces an additional helper function,
has_object_file, which is the equivalent of has_sha1_file. The name was
chosen to be slightly more logical than has_oid_file, although it can be
changed if desired.
The next-to-last patch in this series is the conversion of struct object
to use struct object_id. This is a necessarily large patch because of
the large number of places this code is used. That patch will most
likely be too large to make it through to the list, so this series is
available in the object-id-part2 branch from:
https://github.com/bk2204/git.git
https://git.crustytoothpaste.net/git/bmc/git.git
Changes from v1:
* Rebase on newer master.
* Drop parse_oid_hex. It ended up not being very useful (only 4 uses
over 47 patches) and a better version, like the one Michael Haggerty
suggested, can be introduced later if it's beneficial.
* Fix the code that caused the httpd unit tests to fail. This series
passes the testsuite on each commit, including the httpd tests.
* Convert the remaining places touched by the first patch to use
object_id. These were split out into their own patches to keep
patches to a reasonable size. Some of these were in the original
series, and some were not.
* Convert remote.c as well. As part of the previous item, I went
through remote.c and converted the places touched by the first patch,
and realized that it was trivial to convert the rest of the file.
This patch is at the end as we can get slightly better conversion by
doing it after the conversion of struct object, meaning we can avoid
making another pass later. I blame Michael for the inspiration to do
this. :-)
brian m. carlson (10):
refs: convert some internal functions to use object_id
sha1_file: introduce has_object_file helper.
Convert struct ref to use object_id.
add_sought_entry_mem: convert to struct object_id
parse_fetch: convert to use struct object_id
get_remote_heads: convert to struct object_id
push_refs_with_export: convert to struct object_id
ref_newer: convert to use struct object_id
Convert struct object to object_id
remote: convert functions to struct object_id
archive.c | 6 +--
bisect.c | 10 ++--
branch.c | 2 +-
builtin/blame.c | 46 +++++++++---------
builtin/branch.c | 2 +-
builtin/checkout.c | 24 +++++-----
builtin/clone.c | 18 +++----
builtin/commit-tree.c | 4 +-
builtin/commit.c | 8 ++--
builtin/describe.c | 20 ++++----
builtin/diff-tree.c | 12 ++---
builtin/diff.c | 12 ++---
builtin/fast-export.c | 34 +++++++-------
builtin/fetch-pack.c | 14 +++---
builtin/fetch.c | 54 ++++++++++-----------
builtin/fmt-merge-msg.c | 6 +--
builtin/for-each-ref.c | 12 ++---
builtin/fsck.c | 34 +++++++-------
builtin/grep.c | 6 +--
builtin/index-pack.c | 10 ++--
builtin/log.c | 24 +++++-----
builtin/ls-remote.c | 2 +-
builtin/merge-base.c | 8 ++--
builtin/merge-tree.c | 6 +--
builtin/merge.c | 60 ++++++++++++------------
builtin/name-rev.c | 12 ++---
builtin/notes.c | 2 +-
builtin/pack-objects.c | 16 +++----
builtin/receive-pack.c | 2 +-
builtin/reflog.c | 4 +-
builtin/remote.c | 12 ++---
builtin/replace.c | 2 +-
builtin/reset.c | 6 +--
builtin/rev-list.c | 18 +++----
builtin/rev-parse.c | 4 +-
builtin/shortlog.c | 2 +-
builtin/show-branch.c | 8 ++--
builtin/tag.c | 4 +-
builtin/unpack-objects.c | 10 ++--
bundle.c | 10 ++--
cache-tree.c | 2 +-
cache.h | 3 ++
combine-diff.c | 4 +-
commit.c | 32 ++++++-------
connect.c | 22 +++++----
decorate.c | 2 +-
diff-lib.c | 2 +-
fetch-pack.c | 24 +++++-----
fsck.c | 10 ++--
http-backend.c | 2 +-
http-push.c | 88 +++++++++++++++++-----------------
http.c | 2 +-
line-log.c | 6 +--
list-objects.c | 4 +-
log-tree.c | 32 ++++++-------
merge-blobs.c | 4 +-
merge-recursive.c | 22 ++++-----
merge.c | 2 +-
notes-merge.c | 24 +++++-----
object.c | 8 ++--
object.h | 2 +-
pack-bitmap-write.c | 16 +++----
pack-bitmap.c | 34 +++++++-------
patch-ids.c | 6 +--
pretty.c | 18 +++----
refs.c | 106 ++++++++++++++++++++---------------------
remote-curl.c | 20 ++++----
remote.c | 120 +++++++++++++++++++++++------------------------
remote.h | 8 ++--
revision.c | 48 +++++++++----------
send-pack.c | 16 +++----
sequencer.c | 38 +++++++--------
server-info.c | 2 +-
sha1_file.c | 5 ++
sha1_name.c | 20 ++++----
shallow.c | 6 +--
submodule.c | 8 ++--
tag.c | 10 ++--
test-match-trees.c | 2 +-
transport-helper.c | 24 +++++-----
transport.c | 32 ++++++-------
transport.h | 8 ++--
tree.c | 10 ++--
upload-pack.c | 26 +++++-----
walker.c | 18 +++----
wt-status.c | 2 +-
86 files changed, 729 insertions(+), 717 deletions(-)
--
2.4.0
next reply other threads:[~2015-06-13 22:17 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-13 22:16 brian m. carlson [this message]
2015-06-13 22:16 ` [PATCH v2 01/10] refs: convert some internal functions to use object_id brian m. carlson
2015-06-13 22:16 ` [PATCH v2 02/10] sha1_file: introduce has_object_file helper brian m. carlson
2015-06-13 22:16 ` [PATCH v2 03/10] Convert struct ref to use object_id brian m. carlson
2015-06-15 22:13 ` Junio C Hamano
2015-06-13 22:16 ` [PATCH v2 04/10] add_sought_entry_mem: convert to struct object_id brian m. carlson
2015-06-13 22:16 ` [PATCH v2 05/10] parse_fetch: convert to use " brian m. carlson
2015-06-13 22:16 ` [PATCH v2 06/10] get_remote_heads: convert to " brian m. carlson
2015-06-13 22:16 ` [PATCH v2 07/10] push_refs_with_export: " brian m. carlson
2015-06-13 22:16 ` [PATCH v2 08/10] ref_newer: convert to use " brian m. carlson
2015-06-13 22:16 ` [PATCH v2 10/10] remote: convert functions to " brian m. carlson
2015-08-02 23:33 ` [PATCH v2 00/10] object_id part 2 Michael Haggerty
2015-08-03 23:45 ` 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=1434233803-422442-1-git-send-email-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.
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 NNTP newsgroup(s).