Merge branch 'ob/more-repo-config-values' into jch

* ob/more-repo-config-values:
  env: move "warn_on_object_refname_ambiguity" into `struct repo_config_values`
  env: move "sparse_expect_files_outside_of_patterns" into `repo_config_values`
  env: move "core_sparse_checkout_cone" into `struct repo_config_values`
  environment: move "precomposed_unicode" into `struct repo_config_values`
  environment: move "pack_compression_level" into `struct repo_config_values`
  environment: move `zlib_compression_level` into `struct repo_config_values`
  environment: move "check_stat" into `struct repo_config_values`
  environment: move "trust_ctime" into `struct repo_config_values`

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

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

diff --cc builtin/mv.c
Simple merge

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

diff --cc builtin/sparse-checkout.c
index d89acbeb533bd80e49e7a0ed8dabd9e13fc112eb,92d017b81f9a327b4ea77436c422b1609602b8c1..0863d0fb460cf80bdbce6bcc270bd25eb81a557b
--- 1/builtin/sparse-checkout.c
--- 2/builtin/sparse-checkout.c
+++ b/builtin/sparse-checkout.c
@@@ -975,10 -980,10 +981,10 @@@ static int sparse_checkout_clean(int ar
                OPT_END(),
        };
  
 -      setup_work_tree();
 +      setup_work_tree(the_repository);
        if (!cfg->apply_sparse_checkout)
                die(_("must be in a sparse-checkout to clean directories"));
-       if (!core_sparse_checkout_cone)
+       if (!cfg->core_sparse_checkout_cone)
                die(_("must be in a cone-mode sparse-checkout to clean directories"));
  
        argc = parse_options(argc, argv, prefix,

diff --cc diff.c
Simple merge

diff --cc dir.c
Simple merge

diff --cc environment.h
Simple merge

diff --cc http-push.c
Simple merge

diff --cc object-file.c
index 90f995d0000bf67d2a6756e6c50251997afe3831,37def5cc5907841418b2294a87950189d8ada125..60c4719fe19fbdfdbcfc4f34c805076b83b0d211
--- 1/object-file.c
--- 2/object-file.c
+++ b/object-file.c
@@@ -1464,9 -1435,11 +1465,10 @@@ static void stream_blob_to_pack(struct 
        unsigned char obuf[16384];
        unsigned hdrlen;
        int status = Z_OK;
 -      int write_object = (flags & INDEX_WRITE_OBJECT);
 -      off_t offset = 0;
+       struct repo_config_values *cfg = repo_config_values(the_repository);
 +      size_t bytes_read = 0;
  
-       git_deflate_init(&s, pack_compression_level);
+       git_deflate_init(&s, cfg->pack_compression_level);
  
        hdrlen = encode_in_pack_object_header(obuf, sizeof(obuf), OBJ_BLOB, size);
        s.next_out = obuf + hdrlen;

diff --cc object-name.c
Simple merge

diff --cc revision.c
Simple merge

diff --cc submodule.c
Simple merge

diff --cc upload-pack.c
Simple merge