Merge branch 'jc/pass-repo-to-builtins'

The convention to calling into built-in command implementation has
been updated to pass the repository, if known, together with the
prefix value.

* jc/pass-repo-to-builtins:
  add: pass in repo variable instead of global the_repository
  builtin: remove USE_THE_REPOSITORY for those without the_repository
  builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h
  builtin: add a repository parameter for builtin functions

diff --cc builtin/am.c
Simple merge

diff --cc builtin/archive.c
Simple merge

diff --cc builtin/bisect.c
Simple merge

diff --cc builtin/blame.c
Simple merge

diff --cc builtin/branch.c
Simple merge

diff --cc builtin/bundle.c
Simple merge

diff --cc builtin/cat-file.c
Simple merge

diff --cc builtin/check-mailmap.c
Simple merge

diff --cc builtin/checkout.c
Simple merge

diff --cc builtin/commit-graph.c
Simple merge

diff --cc builtin/commit.c
Simple merge

diff --cc builtin/config.c
Simple merge

diff --cc builtin/count-objects.c
index 42275f62d591b8224cdb6be409a36488c733d5b5,3d7b289f5970f9eebe8954bb170492d861f22ab0..04d80887e0eb98b13326b406c879a1be51f42f40
--- 1/builtin/count-objects.c
--- 2/builtin/count-objects.c
+++ b/builtin/count-objects.c
@@@ -7,9 -7,9 +7,8 @@@
  #include "builtin.h"
  #include "config.h"
  #include "dir.h"
 -#include "environment.h"
  #include "gettext.h"
  #include "path.h"
- #include "repository.h"
  #include "parse-options.h"
  #include "quote.h"
  #include "packfile.h"

diff --cc builtin/describe.c
Simple merge

diff --cc builtin/diff-files.c
Simple merge

diff --cc builtin/diff-index.c
Simple merge

diff --cc builtin/diff-tree.c
Simple merge

diff --cc builtin/diff.c
Simple merge

diff --cc builtin/difftool.c
Simple merge

diff --cc builtin/fetch-pack.c
index fe404d1305b724ed81395c2c61150202cc4d039c,d2c4304d222650e3976aaa5960d8cb0d87d7ea3a..49222a36fa6f295dee01ed83c1c68195cc74563d
--- 1/builtin/fetch-pack.c
--- 2/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@@ -43,10 -44,13 +44,13 @@@ static void add_sought_entry(struct re
        (*sought)[*nr - 1] = ref;
  }
  
- int cmd_fetch_pack(int argc, const char **argv, const char *prefix UNUSED)
+ int cmd_fetch_pack(int argc,
+                  const char **argv,
+                  const char *prefix UNUSED,
+                  struct repository *repo UNUSED)
  {
        int i, ret;
 -      struct ref *ref = NULL;
 +      struct ref *fetched_refs = NULL, *remote_refs = NULL;
        const char *dest = NULL;
        struct ref **sought = NULL;
        int nr_sought = 0, alloc_sought = 0;

diff --cc builtin/fetch.c
Simple merge

diff --cc builtin/fmt-merge-msg.c
Simple merge

diff --cc builtin/for-each-ref.c
Simple merge

diff --cc builtin/fsmonitor--daemon.c
Simple merge

diff --cc builtin/gc.c
Simple merge

diff --cc builtin/grep.c
Simple merge

diff --cc builtin/index-pack.c
Simple merge

diff --cc builtin/init-db.c
Simple merge

diff --cc builtin/interpret-trailers.c
Simple merge

diff --cc builtin/log.c
Simple merge

diff --cc builtin/merge-tree.c
Simple merge

diff --cc builtin/merge.c
Simple merge

diff --cc builtin/multi-pack-index.c
Simple merge

diff --cc builtin/notes.c
Simple merge

diff --cc builtin/pack-objects.c
Simple merge

diff --cc builtin/patch-id.c
Simple merge

diff --cc builtin/prune.c
Simple merge

diff --cc builtin/push.c
Simple merge

diff --cc builtin/rebase.c
Simple merge

diff --cc builtin/remote.c
Simple merge

diff --cc builtin/repack.c
Simple merge

diff --cc builtin/replace.c
Simple merge

diff --cc builtin/reset.c
Simple merge

diff --cc builtin/rev-parse.c
Simple merge

diff --cc builtin/send-pack.c
Simple merge

diff --cc builtin/sparse-checkout.c
Simple merge

diff --cc builtin/stash.c
Simple merge

diff --cc builtin/submodule--helper.c
Simple merge

diff --cc builtin/tag.c
Simple merge

diff --cc builtin/update-index.c
Simple merge

diff --cc builtin/upload-archive.c
Simple merge

diff --cc builtin/verify-tag.c
Simple merge

diff --cc builtin/worktree.c
Simple merge

diff --cc builtin/write-tree.c
index 9bcc4470ce1e145c0dd0f67b5b27ed4128fd13f4,de4ebf767d47449f9906dae932d07fd21616e9c4..43f233e69b08aeb85583a9ae4c0bbf7e76a847ed
--- 1/builtin/write-tree.c
--- 2/builtin/write-tree.c
+++ b/builtin/write-tree.c
@@@ -3,9 -3,10 +3,9 @@@
   *
   * Copyright (C) Linus Torvalds, 2005
   */
- 
+ #define USE_THE_REPOSITORY_VARIABLE
  #include "builtin.h"
  #include "config.h"
 -#include "environment.h"
  #include "gettext.h"
  #include "hex.h"
  #include "tree.h"

diff --cc commit.h
Simple merge

diff --cc help.c
Simple merge