From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.2 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id EE30F1F404 for ; Mon, 19 Feb 2018 22:59:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932200AbeBSW7g (ORCPT ); Mon, 19 Feb 2018 17:59:36 -0500 Received: from injection.crustytoothpaste.net ([192.241.140.119]:33262 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932190AbeBSW7f (ORCPT ); Mon, 19 Feb 2018 17:59:35 -0500 Received: from genre.crustytoothpaste.net (unknown [IPv6:2001:470:b978:101:e6b3:18ff:fe98:41a3]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by injection.crustytoothpaste.net (Postfix) with ESMTPSA id 6370D6096E; Mon, 19 Feb 2018 22:59:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1519081173; bh=rWKN9L7sF0M3HkgwA40h+RY6vFav2O0+kXNDUiXbEVU=; h=From:To:Cc:Subject:Date:From:Reply-To:Subject:Date:To:CC: Resent-Date:Resent-From:Resent-To:Resent-Cc:In-Reply-To:References: Content-Type:Content-Disposition; b=swYRwbZFoML4BZRQlaqixamK6UNCn6quzHPDrfgSdv/o6WDhICAS18Xha7egz/GVM a1uHiiCAZfB0voYw85Cp79+9zrr6w/Dgz4PFNjMSMntscEwS37cNTvDAS4wG/O0Oxi JzLNJHYQnBDEOO8JAPE6iNNOTXD5So+ze4KAK1Ap8pBlskEQN7KtJqYgJohmZbRtgB JW172SS2bdyVj61rAbG3x7isoEhZbnAbgm4zVN+cRJW+h4g+Bl5snsTDY6OSJr41bj G50k5X7afxxZG2D+EM8lcfKr8AFyt6+nx/mYg7L50QJhU14a19zdrcDXgglLUm9+BV MTe1U4jPHQLkLfPaDqbg4QN6RvpGkSNfINqX5+ATlBdXanspJLsaFq7jKmizCzLjoB xNbZwGxb/ILN1b3bk1Gg3Jl3H8cAfXIl/SMC3DaSC6tl99VeXe5yKDVYRnkyFX+hxa mtT6NOe+dfb4erKeV9g5FgZdDESY3/UHyqpYigk28Aqby+OWmHO From: "brian m. carlson" To: git@vger.kernel.org Cc: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , Patryk Obara , Jeff King , Eric Sunshine Subject: [PATCH 00/36] object_id part 12 Date: Mon, 19 Feb 2018 22:58:51 +0000 Message-Id: <20180219225927.386065-1-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.16.1.291.g4437f3f132 X-Scanned-By: MIMEDefang 2.79 on 127.0.1.1 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This is the twelfth in a series of patches to convert from unsigned char [20] to struct object_id. This series is based on next. Included in this series are conversions for find_unique_abbrev and lookup_replace_object, as well as parts of the sha1_file code. Conflicts with pu are average in number but minor, mostly because of the type_name conversion. None of them are tricky, except that the introduction of get_tree_entry_if_blob requires a conversion of that function. brian m. carlson (36): bulk-checkin: convert index_bulk_checkin to struct object_id builtin/write-tree: convert to struct object_id cache-tree: convert write_*_as_tree to object_id cache-tree: convert remnants to struct object_id resolve-undo: convert struct resolve_undo_info to object_id tree: convert read_tree_recursive to struct object_id ref-filter: convert grab_objectname to struct object_id strbuf: convert strbuf_add_unique_abbrev to use struct object_id wt-status: convert struct wt_status_state to object_id Convert find_unique_abbrev* to struct object_id http-walker: convert struct object_request to use struct object_id send-pack: convert remaining functions to struct object_id replace_object: convert struct replace_object to object_id builtin/mktag: convert to struct object_id archive: convert write_archive_entry_fn_t to object_id archive: convert sha1_file_to_archive to struct object_id builtin/index-pack: convert struct ref_delta_entry to object_id sha1_file: convert read_loose_object to use struct object_id sha1_file: convert check_sha1_signature to struct object_id streaming: convert open_istream to use struct object_id builtin/mktree: convert to struct object_id sha1_file: convert assert_sha1_type to object_id sha1_file: convert retry_bad_packed_offset to struct object_id packfile: convert unpack_entry to struct object_id Convert remaining callers of sha1_object_info_extended to object_id sha1_file: convert sha1_object_info* to object_id builtin/fmt-merge-msg: convert remaining code to object_id builtin/notes: convert static functions to object_id tree-walk: convert get_tree_entry_follow_symlinks internals to object_id streaming: convert istream internals to struct object_id tree-walk: convert tree entry functions to object_id sha1_file: convert read_object_with_reference to object_id sha1_file: convert read_sha1_file to struct object_id Convert lookup_replace_object to struct object_id sha1_file: introduce a constant for max header length convert: convert to struct object_id apply.c | 4 +- archive-tar.c | 28 ++++---- archive-zip.c | 18 ++--- archive.c | 32 ++++----- archive.h | 10 +-- bisect.c | 3 +- blame.c | 18 +++-- builtin/am.c | 8 +-- builtin/blame.c | 4 +- builtin/branch.c | 2 +- builtin/cat-file.c | 30 +++++---- builtin/checkout.c | 12 ++-- builtin/commit-tree.c | 2 +- builtin/describe.c | 6 +- builtin/difftool.c | 2 +- builtin/fast-export.c | 8 +-- builtin/fetch.c | 10 +-- builtin/fmt-merge-msg.c | 4 +- builtin/fsck.c | 4 +- builtin/grep.c | 6 +- builtin/index-pack.c | 43 ++++++------ builtin/log.c | 8 +-- builtin/ls-files.c | 4 +- builtin/ls-tree.c | 8 +-- builtin/merge-tree.c | 5 +- builtin/merge.c | 8 +-- builtin/mktag.c | 20 +++--- builtin/mktree.c | 24 +++---- builtin/name-rev.c | 2 +- builtin/notes.c | 14 ++-- builtin/pack-objects.c | 27 ++++---- builtin/prune.c | 2 +- builtin/receive-pack.c | 8 +-- builtin/reflog.c | 2 +- builtin/replace.c | 10 +-- builtin/reset.c | 2 +- builtin/rev-list.c | 2 +- builtin/rev-parse.c | 2 +- builtin/rm.c | 2 +- builtin/show-branch.c | 2 +- builtin/show-ref.c | 4 +- builtin/tag.c | 16 +++-- builtin/unpack-file.c | 2 +- builtin/unpack-objects.c | 4 +- builtin/update-index.c | 2 +- builtin/verify-commit.c | 2 +- builtin/worktree.c | 4 +- builtin/write-tree.c | 6 +- bulk-checkin.c | 18 ++--- bulk-checkin.h | 2 +- bundle.c | 2 +- cache-tree.c | 36 +++++----- cache-tree.h | 4 +- cache.h | 42 ++++++------ combine-diff.c | 6 +- commit.c | 8 +-- config.c | 2 +- convert.c | 12 ++-- convert.h | 2 +- diff.c | 6 +- dir.c | 2 +- entry.c | 4 +- fast-import.c | 31 ++++----- fsck.c | 2 +- grep.c | 2 +- http-push.c | 2 +- http-walker.c | 16 ++--- line-log.c | 3 +- list-objects-filter.c | 2 +- log-tree.c | 12 ++-- mailmap.c | 2 +- match-trees.c | 10 +-- merge-blobs.c | 4 +- merge-recursive.c | 20 +++--- notes-cache.c | 2 +- notes-merge.c | 2 +- notes.c | 10 +-- object.c | 12 ++-- pack-bitmap-write.c | 3 +- pack-check.c | 4 +- packfile.c | 30 ++++----- pretty.c | 8 +-- reachable.c | 2 +- read-cache.c | 4 +- ref-filter.c | 14 ++-- refs.c | 2 +- remote-testsvn.c | 4 +- remote.c | 2 +- replace_object.c | 26 ++++---- rerere.c | 4 +- resolve-undo.c | 8 +-- resolve-undo.h | 2 +- send-pack.c | 12 ++-- sequencer.c | 9 +-- sha1_file.c | 137 ++++++++++++++++++++------------------- sha1_name.c | 31 +++++---- strbuf.c | 4 +- strbuf.h | 8 ++- streaming.c | 18 ++--- streaming.h | 2 +- submodule-config.c | 2 +- submodule.c | 6 +- tag.c | 10 +-- transport.c | 6 +- tree-walk.c | 45 +++++++------ tree-walk.h | 2 +- tree.c | 16 ++--- tree.h | 2 +- wt-status.c | 20 +++--- wt-status.h | 6 +- xdiff-interface.c | 2 +- 111 files changed, 593 insertions(+), 582 deletions(-)