]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ab/remove-implicit-use-of-the-repository'
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Apr 2023 20:38:30 +0000 (13:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Apr 2023 20:38:30 +0000 (13:38 -0700)
Code clean-up around the use of the_repository.

* ab/remove-implicit-use-of-the-repository:
  libs: use "struct repository *" argument, not "the_repository"
  post-cocci: adjust comments for recent repo_* migration
  cocci: apply the "revision.h" part of "the_repository.pending"
  cocci: apply the "rerere.h" part of "the_repository.pending"
  cocci: apply the "refs.h" part of "the_repository.pending"
  cocci: apply the "promisor-remote.h" part of "the_repository.pending"
  cocci: apply the "packfile.h" part of "the_repository.pending"
  cocci: apply the "pretty.h" part of "the_repository.pending"
  cocci: apply the "object-store.h" part of "the_repository.pending"
  cocci: apply the "diff.h" part of "the_repository.pending"
  cocci: apply the "commit.h" part of "the_repository.pending"
  cocci: apply the "commit-reach.h" part of "the_repository.pending"
  cocci: apply the "cache.h" part of "the_repository.pending"
  cocci: add missing "the_repository" macros to "pending"
  cocci: sort "the_repository" rules by header
  cocci: fix incorrect & verbose "the_repository" rules
  cocci: remove dead rule from "the_repository.pending.cocci"

128 files changed:
1  2 
add-interactive.c
add-patch.c
apply.c
archive.c
bisect.c
blame.c
branch.c
builtin/am.c
builtin/bisect.c
builtin/blame.c
builtin/branch.c
builtin/cat-file.c
builtin/checkout.c
builtin/clone.c
builtin/commit-tree.c
builtin/commit.c
builtin/describe.c
builtin/diff.c
builtin/difftool.c
builtin/fast-export.c
builtin/fast-import.c
builtin/fetch.c
builtin/fsck.c
builtin/gc.c
builtin/grep.c
builtin/index-pack.c
builtin/log.c
builtin/ls-files.c
builtin/ls-tree.c
builtin/merge-base.c
builtin/merge-recursive.c
builtin/merge-tree.c
builtin/merge.c
builtin/mktag.c
builtin/name-rev.c
builtin/notes.c
builtin/pack-objects.c
builtin/prune.c
builtin/pull.c
builtin/read-tree.c
builtin/rebase.c
builtin/receive-pack.c
builtin/repack.c
builtin/replace.c
builtin/reset.c
builtin/rev-list.c
builtin/rev-parse.c
builtin/rm.c
builtin/show-branch.c
builtin/show-ref.c
builtin/sparse-checkout.c
builtin/stash.c
builtin/submodule--helper.c
builtin/tag.c
builtin/unpack-file.c
builtin/unpack-objects.c
builtin/verify-commit.c
builtin/verify-tag.c
builtin/worktree.c
bulk-checkin.c
bundle.c
cache-tree.c
cache.h
combine-diff.c
commit-graph.c
commit-reach.c
commit-reach.h
commit.c
commit.h
connected.c
delta-islands.c
diff-lib.c
diff.c
diff.h
diffcore-rename.c
dir.c
entry.c
fetch-pack.c
fmt-merge-msg.c
fsck.c
http-push.c
http-walker.c
list-objects-filter-options.c
list-objects.c
log-tree.c
mailmap.c
match-trees.c
merge-blobs.c
merge-ort.c
merge-recursive.c
negotiator/skipping.c
notes-merge.c
notes.c
object-file.c
object-name.c
object-store.h
pack-bitmap-write.c
packfile.c
parse-options-cb.c
pretty.c
pretty.h
read-cache.c
ref-filter.c
refs.c
remote.c
rerere.c
reset.c
revision.c
revision.h
send-pack.c
sequencer.c
shallow.c
submodule-config.c
submodule.c
t/helper/test-fast-rebase.c
t/helper/test-match-trees.c
t/helper/test-oidmap.c
t/helper/test-reach.c
t/helper/test-submodule-config.c
tag.c
transport-helper.c
transport.c
tree.c
unpack-trees.c
upload-pack.c
walker.c
wt-status.c
xdiff-interface.c

Simple merge
diff --cc add-patch.c
Simple merge
diff --cc apply.c
Simple merge
diff --cc archive.c
Simple merge
diff --cc bisect.c
Simple merge
diff --cc blame.c
Simple merge
diff --cc branch.c
Simple merge
diff --cc builtin/am.c
Simple merge
Simple merge
diff --cc builtin/blame.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc builtin/clone.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc builtin/diff.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc builtin/fetch.c
Simple merge
diff --cc builtin/fsck.c
Simple merge
diff --cc builtin/gc.c
Simple merge
diff --cc builtin/grep.c
Simple merge
Simple merge
diff --cc builtin/log.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc builtin/merge.c
Simple merge
diff --cc builtin/mktag.c
Simple merge
Simple merge
diff --cc builtin/notes.c
Simple merge
Simple merge
diff --cc builtin/prune.c
Simple merge
diff --cc builtin/pull.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc builtin/reset.c
Simple merge
Simple merge
Simple merge
diff --cc builtin/rm.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc builtin/stash.c
Simple merge
Simple merge
diff --cc builtin/tag.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc bulk-checkin.c
Simple merge
diff --cc bundle.c
Simple merge
diff --cc cache-tree.c
Simple merge
diff --cc cache.h
index 5a736a2b7e714afbc28cc398e6b088c9f0a52293,555354e1961546793235d531dd92ff14899d311f..0ede88565627a8f721e6adda9b622bdb12e27e81
+++ b/cache.h
@@@ -1409,9 -1616,25 +1396,7 @@@ void *read_object_with_reference(struc
  struct object *repo_peel_to_type(struct repository *r,
                                 const char *name, int namelen,
                                 struct object *o, enum object_type);
- #define peel_to_type(name, namelen, obj, type) \
-       repo_peel_to_type(the_repository, name, namelen, obj, type)
  
 -#define IDENT_STRICT         1
 -#define IDENT_NO_DATE        2
 -#define IDENT_NO_NAME        4
 -
 -enum want_ident {
 -      WANT_BLANK_IDENT,
 -      WANT_AUTHOR_IDENT,
 -      WANT_COMMITTER_IDENT
 -};
 -
 -const char *git_author_info(int);
 -const char *git_committer_info(int);
 -const char *fmt_ident(const char *name, const char *email,
 -                    enum want_ident whose_ident,
 -                    const char *date_str, int);
 -const char *fmt_name(enum want_ident);
 -const char *ident_default_name(void);
 -const char *ident_default_email(void);
  const char *git_editor(void);
  const char *git_sequence_editor(void);
  const char *git_pager(int stdout_is_tty);
diff --cc combine-diff.c
Simple merge
diff --cc commit-graph.c
Simple merge
diff --cc commit-reach.c
Simple merge
diff --cc commit-reach.h
Simple merge
diff --cc commit.c
Simple merge
diff --cc commit.h
index 06657b4c6e7494899b4e9671f6dd08d8c5c96db1,d4adf111019db199ff1c2c24d882bef5676afe84..69b2f376e9d91de7ecc554fcb1610332ac205d3a
+++ b/commit.h
@@@ -205,9 -193,7 +193,6 @@@ void free_commit_list(struct commit_lis
  
  struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
  
- const char *logmsg_reencode(const struct commit *commit,
-                           char **commit_encoding,
-                           const char *output_encoding);
 -int has_non_ascii(const char *text);
  const char *repo_logmsg_reencode(struct repository *r,
                                 const struct commit *commit,
                                 char **commit_encoding,
diff --cc connected.c
Simple merge
diff --cc delta-islands.c
Simple merge
diff --cc diff-lib.c
Simple merge
diff --cc diff.c
Simple merge
diff --cc diff.h
Simple merge
Simple merge
diff --cc dir.c
Simple merge
diff --cc entry.c
Simple merge
diff --cc fetch-pack.c
Simple merge
diff --cc fmt-merge-msg.c
Simple merge
diff --cc fsck.c
Simple merge
diff --cc http-push.c
Simple merge
diff --cc http-walker.c
index 93a4a98a3d3264cd04a5f3f5bf06b1fa503ff896,da1b6b6421005fe8ed14732602ee12a02cd4d9c6..e5dadae377009a642ebf446694a463b57c2b96e1
@@@ -135,10 -135,10 +135,10 @@@ static int fill_active_slot(void *data 
        list_for_each_safe(pos, tmp, head) {
                obj_req = list_entry(pos, struct object_request, node);
                if (obj_req->state == WAITING) {
-                       if (has_object_file(&obj_req->oid))
+                       if (repo_has_object_file(the_repository, &obj_req->oid))
                                obj_req->state = COMPLETE;
                        else {
 -                              start_object_request(walker, obj_req);
 +                              start_object_request(obj_req);
                                return 1;
                        }
                }
Simple merge
diff --cc list-objects.c
Simple merge
diff --cc log-tree.c
Simple merge
diff --cc mailmap.c
Simple merge
diff --cc match-trees.c
Simple merge
diff --cc merge-blobs.c
Simple merge
diff --cc merge-ort.c
Simple merge
Simple merge
Simple merge
diff --cc notes-merge.c
Simple merge
diff --cc notes.c
Simple merge
diff --cc object-file.c
Simple merge
diff --cc object-name.c
Simple merge
diff --cc object-store.h
Simple merge
Simple merge
diff --cc packfile.c
Simple merge
Simple merge
diff --cc pretty.c
Simple merge
diff --cc pretty.h
Simple merge
diff --cc read-cache.c
Simple merge
diff --cc ref-filter.c
Simple merge
diff --cc refs.c
Simple merge
diff --cc remote.c
Simple merge
diff --cc rerere.c
Simple merge
diff --cc reset.c
Simple merge
diff --cc revision.c
Simple merge
diff --cc revision.h
Simple merge
diff --cc send-pack.c
Simple merge
diff --cc sequencer.c
Simple merge
diff --cc shallow.c
Simple merge
Simple merge
diff --cc submodule.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc tag.c
Simple merge
Simple merge
diff --cc transport.c
Simple merge
diff --cc tree.c
Simple merge
diff --cc unpack-trees.c
Simple merge
diff --cc upload-pack.c
Simple merge
diff --cc walker.c
Simple merge
diff --cc wt-status.c
Simple merge
Simple merge