environment.h: move declarations for environment.c functions from cache.h

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/apply.c b/apply.c
index 373565a7bafb6d96c37e52691f15f48122f5b41f..a7c0bccb15c94c32a3d778b94ef686c4fadc7a2a 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -16,6 +16,7 @@
 #include "delta.h"
 #include "diff.h"
 #include "dir.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "xdiff-interface.h"

diff --git a/archive.c b/archive.c
index c3c45a5ebe9f8f73d53baaca3d05099697aac9cc..7aeaaf368f437eb2941afe03f7c81950ab43f1cc 100644 (file)
--- a/archive.c
+++ b/archive.c
@@ -2,6 +2,7 @@
 #include "abspath.h"
 #include "alloc.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "refs.h"

diff --git a/attr.c b/attr.c
index 48e2d646187d1e6d92c18938c2160877347336eb..62127196cb1ad3106d2fc3836c52783706c7df32 100644 (file)
--- a/attr.c
+++ b/attr.c
@@ -9,6 +9,7 @@
 #include "cache.h"
 #include "alloc.h"
 #include "config.h"
+#include "environment.h"
 #include "exec-cmd.h"
 #include "attr.h"
 #include "dir.h"

diff --git a/bisect.c b/bisect.c
index 5a3a8182d839a291c70df32370f6592286c7e0b8..8a4be05dc524635a0f3caf4bf36e5915c3cca43a 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -2,6 +2,7 @@
 #include "config.h"
 #include "commit.h"
 #include "diff.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "revision.h"

diff --git a/branch.c b/branch.c
index 66d32c68564526cf45c09411233986296152444f..3865bdbc87c33e12e09919f44490ee3e41c21080 100644 (file)
--- a/branch.c
+++ b/branch.c
@@ -2,6 +2,7 @@
 #include "cache.h"
 #include "config.h"
 #include "branch.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "refs.h"

diff --git a/builtin/am.c b/builtin/am.c
index 37f82b3eb424cc60bf5e2e881d56e2514492c238..192968ac30077184baef974ccf3ac68ba91b83eb 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -8,6 +8,7 @@
 #include "abspath.h"
 #include "config.h"
 #include "builtin.h"
+#include "environment.h"
 #include "exec-cmd.h"
 #include "gettext.h"
 #include "hex.h"

diff --git a/builtin/bisect.c b/builtin/bisect.c
index 31cc57e45ba9b97107cf90eab2fc749f4d502694..d8e92dfa16aa974e38ce26beec96fe27a8f02e21 100644 (file)
--- a/builtin/bisect.c
+++ b/builtin/bisect.c
@@ -1,5 +1,6 @@
 #include "builtin.h"
 #include "cache.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "parse-options.h"

diff --git a/builtin/blame.c b/builtin/blame.c
index 21f6b523a6d534089d3c42aa45544f6bae5a5086..9ec82edcbde540ffd0ff2c615742b43ac4a5fab0 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -10,6 +10,7 @@
 #include "config.h"
 #include "color.h"
 #include "builtin.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "repository.h"

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 9f1bf8f0e96c480fc4a84831e887765cbe2b34b9..365d9234bdb630fca34e8e4d5648390c2ac7b1a9 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -9,6 +9,7 @@
 #include "config.h"
 #include "builtin.h"
 #include "diff.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "ident.h"

diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index ad27255e2cb0b2f050f76196ddbeea2a471045ec..5870c4683abd7b6b2eaae6655ae1af43f1f3dbe7 100644 (file)
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -3,6 +3,7 @@
 #include "cache.h"
 #include "config.h"
 #include "attr.h"
+#include "environment.h"
 #include "gettext.h"
 #include "quote.h"
 #include "parse-options.h"

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 47d4c369a169eb8409f565755e1c2bef8d46e2c4..5541e76c3374fa0de3fc3f0df0fdfa6b69d28102 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -9,6 +9,7 @@
 #include "config.h"
 #include "diff.h"
 #include "dir.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "hook.h"

diff --git a/builtin/clone.c b/builtin/clone.c
index b94324ea02c3b2c8f53840e4b191983c21fc7356..15dc15408ed57862220cec771f29df4a9afb831d 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -12,6 +12,7 @@
 #include "builtin.h"
 #include "abspath.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "lockfile.h"

diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index 311e0106810f4cdef852b50379af8e47f518b5c8..901142697612feb7354e87049d44048411fbcd13 100644 (file)
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -1,6 +1,7 @@
 #include "builtin.h"
 #include "config.h"
 #include "dir.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "lockfile.h"

diff --git a/builtin/config.c b/builtin/config.c
index 1c1e006ff3fe727e51a73677615e131e7a05284f..cf994a216c019dde85067045cd39e1e1a8928d8f 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -3,6 +3,7 @@
 #include "alloc.h"
 #include "config.h"
 #include "color.h"
+#include "environment.h"
 #include "gettext.h"
 #include "ident.h"
 #include "parse-options.h"

diff --git a/builtin/count-objects.c b/builtin/count-objects.c
index 48edc86c24013b18880459610566cfd7681d8599..f3d8f1bcbb00902356d0bb5f0637b04672af7fe9 100644 (file)
--- a/builtin/count-objects.c
+++ b/builtin/count-objects.c
@@ -7,6 +7,7 @@
 #include "cache.h"
 #include "config.h"
 #include "dir.h"
+#include "environment.h"
 #include "gettext.h"
 #include "repository.h"
 #include "builtin.h"

diff --git a/builtin/describe.c b/builtin/describe.c
index fcacdf8a693e6b21265c91f624cedc4165f581b8..27c6670e934079cb621ca07082c0b79d9ea2e75b 100644 (file)
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -1,6 +1,7 @@
 #define USE_THE_INDEX_VARIABLE
 #include "cache.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "lockfile.h"

diff --git a/builtin/difftool.c b/builtin/difftool.c
index 59465c39f1d1865c54e74a85652ad038214fe8f1..3613de6389f9214c77200da92ff765083d958990 100644 (file)
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -17,6 +17,7 @@
 #include "config.h"
 #include "builtin.h"
 #include "run-command.h"
+#include "environment.h"
 #include "exec-cmd.h"
 #include "gettext.h"
 #include "hex.h"

diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index 3300b7f30f052371a16940a9ab6458821c47441b..068843a5d21c4eed038f1351056892f66ef38124 100644 (file)
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -1,6 +1,7 @@
 #include "builtin.h"
 #include "abspath.h"
 #include "cache.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "repository.h"

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 990f81f6d1a3dcc901ff6fc552e80dde52c81fee..4d883da02e63e2af5b5baabaedd37624dc3b3290 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -4,6 +4,7 @@
 #include "cache.h"
 #include "config.h"
 #include "gettext.h"
+#include "environment.h"
 #include "hex.h"
 #include "repository.h"
 #include "refs.h"

diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c
index 4efb1417344e998d7e278d1ded8df89e044b5dbd..a280d8bb14fad4686820d662b68d167a3e4927cd 100644 (file)
--- a/builtin/fsmonitor--daemon.c
+++ b/builtin/fsmonitor--daemon.c
@@ -2,6 +2,7 @@
 #include "abspath.h"
 #include "alloc.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "parse-options.h"
 #include "fsmonitor.h"

diff --git a/builtin/gc.c b/builtin/gc.c
index 2107e3d1f2cfb5913c287316c04a24977642279c..525c5de5b274c69ebb226ca796fabba384cfbf98 100644 (file)
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -12,6 +12,7 @@
 
 #include "builtin.h"
 #include "abspath.h"
+#include "environment.h"
 #include "hex.h"
 #include "repository.h"
 #include "config.h"

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 2393897cb88db529dae3367ff32efbcbb6b068b0..fdce8f8872433cd8b9b49ab68f4b37bf82dab42c 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -2,6 +2,7 @@
 #include "alloc.h"
 #include "config.h"
 #include "delta.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "pack.h"

diff --git a/builtin/init-db.c b/builtin/init-db.c
index a5d4f5c8ece0d8f6bf5ace2ada69319bd367952d..2ebc9023f5624a254e8b3abf2ae50e5d00531763 100644 (file)
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -6,6 +6,7 @@
 #include "cache.h"
 #include "abspath.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "refs.h"
 #include "builtin.h"

diff --git a/builtin/log.c b/builtin/log.c
index b7333b34cce1edcac4a2613d51f301649dc572a0..1b92dee196e5102debb94e3e1ffafd6d63937ea1 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -8,6 +8,7 @@
 #include "abspath.h"
 #include "alloc.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "refs.h"

diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c
index e14f7c0abce7e6e43603983f534cdea3af438440..a032a1c3881cf4d35f72e8b714204647a3e06400 100644 (file)
--- a/builtin/mailinfo.c
+++ b/builtin/mailinfo.c
@@ -5,6 +5,7 @@
 #include "cache.h"
 #include "abspath.h"
 #include "builtin.h"
+#include "environment.h"
 #include "gettext.h"
 #include "utf8.h"
 #include "strbuf.h"

diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c
index 579bc2cac0cc6789d179633a8befc9f823172373..1b5083f8b26cd8f15bf8e0ee0cadd38cc35fc5c6 100644 (file)
--- a/builtin/multi-pack-index.c
+++ b/builtin/multi-pack-index.c
@@ -2,6 +2,7 @@
 #include "abspath.h"
 #include "cache.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "parse-options.h"
 #include "midx.h"

diff --git a/builtin/mv.c b/builtin/mv.c
index 0a49bf21b0fbffc1af16dd051a73d2004d825058..c2dd42efbf20522253db649d8d3e7c324bc36a57 100644 (file)
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -8,6 +8,7 @@
 #include "abspath.h"
 #include "alloc.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "pathspec.h"
 #include "lockfile.h"

diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index 6977a5f580b83c1778f6f4d5cae61415256ca641..66f82ef66f41e124f7d47ae9fafcd89e83fd30ca 100644 (file)
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -1,5 +1,6 @@
 #include "builtin.h"
 #include "alloc.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "repository.h"

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 8b55a088a7c82cddefe20323e7daf26630fc2985..9829b952c2bf033a0a27df3f8501faf2bd19ab5d 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -1,5 +1,6 @@
 #include "builtin.h"
 #include "alloc.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "repository.h"

diff --git a/builtin/prune.c b/builtin/prune.c
index ff62a0adb8f849897b0d647445decb8ecba3048a..5a381fcdf9a55f8d3a8ef44c9bb956099197f696 100644 (file)
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "commit.h"
 #include "diff.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "revision.h"

diff --git a/builtin/push.c b/builtin/push.c
index 2d76fa683764df4b9f027b11405b855851cd8a6c..fa550b8f80ad4e3d8da1f15fbf98ba8ac6858d03 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -4,6 +4,7 @@
 #include "cache.h"
 #include "branch.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "refs.h"
 #include "refspec.h"

diff --git a/builtin/rebase.c b/builtin/rebase.c
index d2f8f703d67de8c63a779b1928826d9d72220cc7..9f3135116edbf08a7bafae0ed6e6d2b184b51bce 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -7,6 +7,7 @@
 #define USE_THE_INDEX_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "run-command.h"

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index ae49ea8c2adc947e36e432de3ba7977ba9fd5923..3745c0b95cdf65ca0f4a4b9dc23248eb81ee61d0 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -2,6 +2,7 @@
 #include "abspath.h"
 #include "repository.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "lockfile.h"

diff --git a/builtin/repack.c b/builtin/repack.c
index 771ca01527d6dda695a966df44ff05499c84c8dc..ccbd5f55562417ce2fba8ef6179ae62b45f51bd2 100644 (file)
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -2,6 +2,7 @@
 #include "alloc.h"
 #include "config.h"
 #include "dir.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "parse-options.h"

diff --git a/builtin/replace.c b/builtin/replace.c
index cf85e590d9fbaf0eb65383215d13b6b808c25954..dc0331defc2dd5b40dbbd404d00d6d15b9044255 100644 (file)
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -11,6 +11,7 @@
 #include "cache.h"
 #include "config.h"
 #include "builtin.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "refs.h"

diff --git a/builtin/reset.c b/builtin/reset.c
index 4335c1a6e1b4ef617c959ab1ed0a7602d6c642fc..b5dfce1159e65887b5866ad9da4847bb89425a8a 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -10,6 +10,7 @@
 #define USE_THE_INDEX_VARIABLE
 #include "builtin.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "lockfile.h"

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index f2f6a0d3e675b706d4f31c7b392e24bf562755b7..b202647f281918e2ce22c330a6eda7c6779e8184 100644 (file)
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -2,6 +2,7 @@
 #include "config.h"
 #include "commit.h"
 #include "diff.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "revision.h"

diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index a4c0878bc916cab0d539f8497c3650c8be728e1e..bba49d56b9f11f219922b445f2773ea7ee574c8b 100644 (file)
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -9,6 +9,7 @@
 #include "alloc.h"
 #include "config.h"
 #include "commit.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "refs.h"

diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index d8c4379ea16903436c881aa51639e70fda81c4ff..31f81c25ea27f51ade41c4ca05aa3c7e7fa45f17 100644 (file)
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -3,6 +3,7 @@
 #include "config.h"
 #include "commit.h"
 #include "diff.h"
+#include "environment.h"
 #include "gettext.h"
 #include "string-list.h"
 #include "revision.h"

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 8d569629726c35f421025794219562501d0e1bf6..c4aa0e62f2660fe5c74a3a32fe6c055939f4fe21 100644 (file)
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "pretty.h"

diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
index 3976d8e86b8639070114b2ababd08e1a894eb82e..f6a120c7c45e3f68ff36f9c4212f9deb562b0ee5 100644 (file)
--- a/builtin/sparse-checkout.c
+++ b/builtin/sparse-checkout.c
@@ -2,6 +2,7 @@
 #include "cache.h"
 #include "config.h"
 #include "dir.h"
+#include "environment.h"
 #include "gettext.h"
 #include "parse-options.h"
 #include "pathspec.h"

diff --git a/builtin/stash.c b/builtin/stash.c
index 52fa892f7eb45750788d299a10448c5e9ee3920d..94f81d75d034b8fcdb4ce50427a3d3d95b62571a 100644 (file)
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -2,6 +2,7 @@
 #include "builtin.h"
 #include "abspath.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "parse-options.h"

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index ff1fd8c87abcbd8f4e86c3205652e33759797bb5..2bf2a1a8be5e35ed60af4d3487424b17f1dcb07c 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -2,6 +2,7 @@
 #include "builtin.h"
 #include "abspath.h"
 #include "alloc.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "repository.h"

diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index f7c4b531076dd6147c6f76224d278d7a4c5ca40c..c65ae3b2078551e9dffdb9d58883ff90895bff29 100644 (file)
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -2,6 +2,7 @@
 #include "cache.h"
 #include "bulk-checkin.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "object-store.h"

diff --git a/builtin/update-index.c b/builtin/update-index.c
index ef78b2d28e1b5c45a0fd8e3e672381747f9a0aed..4642afaeb771b77d1d734fc97aa8d252e74a9ff1 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -7,6 +7,7 @@
 #include "cache.h"
 #include "bulk-checkin.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "lockfile.h"

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 1533b4ab43c117093cfddfb67001b6cecc12860a..d9345efdb2be61bf49913f161c11c43555ed0708 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -4,6 +4,7 @@
 #include "config.h"
 #include "builtin.h"
 #include "dir.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "parse-options.h"

diff --git a/builtin/write-tree.c b/builtin/write-tree.c
index 7eec4e3cbd14517c52431f72777b3a29cdd4892a..6085f64d1009528a9e21a888755c649480ae87ed 100644 (file)
--- a/builtin/write-tree.c
+++ b/builtin/write-tree.c
@@ -7,6 +7,7 @@
 #include "builtin.h"
 #include "cache.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "tree.h"

diff --git a/bulk-checkin.c b/bulk-checkin.c
index 778ca1e0f4f85662c94ac2cb791483c2fcb1c55a..eb6d7a2805b066c80d199833291afaa23c1d71c9 100644 (file)
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -4,6 +4,7 @@
 #include "git-compat-util.h"
 #include "alloc.h"
 #include "bulk-checkin.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "lockfile.h"

diff --git a/bundle-uri.c b/bundle-uri.c
index 2cc7d159bd6a8e15cb7a27be61f0b4daaf3e9aca..1ff1cf51dad3da212b2d01e2ed1d1355ac40434f 100644 (file)
--- a/bundle-uri.c
+++ b/bundle-uri.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "bundle-uri.h"
 #include "bundle.h"
+#include "environment.h"
 #include "gettext.h"
 #include "object-store.h"
 #include "refs.h"

diff --git a/bundle.c b/bundle.c
index f5b3643b17eba3d13ae80d95549d9b829bd2104b..efeaf6f71515af29819fb65cd66a563f795f67e4 100644 (file)
--- a/bundle.c
+++ b/bundle.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "lockfile.h"
 #include "bundle.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "object-store.h"

diff --git a/cache-tree.c b/cache-tree.c
index 6f899beb041032361e721461ad9ac4d2968c94e7..231c3eb2ff6384b424944aa7e4dc2e534909fc82 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "alloc.h"
+#include "environment.h"
 #include "hex.h"
 #include "lockfile.h"
 #include "tree.h"

diff --git a/cache.h b/cache.h
index 31c722533f9ba0d52dff749f0f28d226ab3a98d4..720c88f9fd63685e8e256f7477803b6a6317a5e1 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -452,98 +452,10 @@ static inline enum object_type object_type(unsigned int mode)
                OBJ_BLOB;
 }
 
-/* Double-check local_repo_env below if you add to this list. */
-#define GIT_DIR_ENVIRONMENT "GIT_DIR"
-#define GIT_COMMON_DIR_ENVIRONMENT "GIT_COMMON_DIR"
-#define GIT_NAMESPACE_ENVIRONMENT "GIT_NAMESPACE"
-#define GIT_WORK_TREE_ENVIRONMENT "GIT_WORK_TREE"
-#define GIT_PREFIX_ENVIRONMENT "GIT_PREFIX"
-#define DEFAULT_GIT_DIR_ENVIRONMENT ".git"
-#define DB_ENVIRONMENT "GIT_OBJECT_DIRECTORY"
-#define INDEX_ENVIRONMENT "GIT_INDEX_FILE"
-#define GRAFT_ENVIRONMENT "GIT_GRAFT_FILE"
-#define GIT_SHALLOW_FILE_ENVIRONMENT "GIT_SHALLOW_FILE"
-#define TEMPLATE_DIR_ENVIRONMENT "GIT_TEMPLATE_DIR"
-#define CONFIG_ENVIRONMENT "GIT_CONFIG"
-#define CONFIG_DATA_ENVIRONMENT "GIT_CONFIG_PARAMETERS"
-#define CONFIG_COUNT_ENVIRONMENT "GIT_CONFIG_COUNT"
-#define EXEC_PATH_ENVIRONMENT "GIT_EXEC_PATH"
-#define CEILING_DIRECTORIES_ENVIRONMENT "GIT_CEILING_DIRECTORIES"
-#define NO_REPLACE_OBJECTS_ENVIRONMENT "GIT_NO_REPLACE_OBJECTS"
-#define GIT_REPLACE_REF_BASE_ENVIRONMENT "GIT_REPLACE_REF_BASE"
-#define GITATTRIBUTES_FILE ".gitattributes"
-#define INFOATTRIBUTES_FILE "info/attributes"
-#define ATTRIBUTE_MACRO_PREFIX "[attr]"
-#define GITMODULES_FILE ".gitmodules"
-#define GITMODULES_INDEX ":.gitmodules"
-#define GITMODULES_HEAD "HEAD:.gitmodules"
-#define GIT_NOTES_REF_ENVIRONMENT "GIT_NOTES_REF"
-#define GIT_NOTES_DEFAULT_REF "refs/notes/commits"
-#define GIT_NOTES_DISPLAY_REF_ENVIRONMENT "GIT_NOTES_DISPLAY_REF"
-#define GIT_NOTES_REWRITE_REF_ENVIRONMENT "GIT_NOTES_REWRITE_REF"
-#define GIT_NOTES_REWRITE_MODE_ENVIRONMENT "GIT_NOTES_REWRITE_MODE"
-#define GIT_LITERAL_PATHSPECS_ENVIRONMENT "GIT_LITERAL_PATHSPECS"
-#define GIT_GLOB_PATHSPECS_ENVIRONMENT "GIT_GLOB_PATHSPECS"
-#define GIT_NOGLOB_PATHSPECS_ENVIRONMENT "GIT_NOGLOB_PATHSPECS"
-#define GIT_ICASE_PATHSPECS_ENVIRONMENT "GIT_ICASE_PATHSPECS"
-#define GIT_QUARANTINE_ENVIRONMENT "GIT_QUARANTINE_PATH"
-#define GIT_OPTIONAL_LOCKS_ENVIRONMENT "GIT_OPTIONAL_LOCKS"
-#define GIT_TEXT_DOMAIN_DIR_ENVIRONMENT "GIT_TEXTDOMAINDIR"
-
-/*
- * Environment variable used in handshaking the wire protocol.
- * Contains a colon ':' separated list of keys with optional values
- * 'key[=value]'.  Presence of unknown keys and values must be
- * ignored.
- */
-#define GIT_PROTOCOL_ENVIRONMENT "GIT_PROTOCOL"
-/* HTTP header used to handshake the wire protocol */
-#define GIT_PROTOCOL_HEADER "Git-Protocol"
-
-/*
- * This environment variable is expected to contain a boolean indicating
- * whether we should or should not treat:
- *
- *   GIT_DIR=foo.git git ...
- *
- * as if GIT_WORK_TREE=. was given. It's not expected that users will make use
- * of this, but we use it internally to communicate to sub-processes that we
- * are in a bare repo. If not set, defaults to true.
- */
-#define GIT_IMPLICIT_WORK_TREE_ENVIRONMENT "GIT_IMPLICIT_WORK_TREE"
-
-/*
- * Repository-local GIT_* environment variables; these will be cleared
- * when git spawns a sub-process that runs inside another repository.
- * The array is NULL-terminated, which makes it easy to pass in the "env"
- * parameter of a run-command invocation, or to do a simple walk.
- */
-extern const char * const local_repo_env[];
-
-void setup_git_env(const char *git_dir);
-
-/*
- * Returns true iff we have a configured git repository (either via
- * setup_git_directory, or in the environment via $GIT_DIR).
- */
-int have_git_dir(void);
-
-extern int is_bare_repository_cfg;
-int is_bare_repository(void);
 int is_inside_git_dir(void);
-extern char *git_work_tree_cfg;
 int is_inside_work_tree(void);
-const char *get_git_dir(void);
-const char *get_git_common_dir(void);
-const char *get_object_directory(void);
-char *get_index_file(void);
-char *get_graft_file(struct repository *r);
-void set_git_dir(const char *path, int make_realpath);
 int get_common_dir_noenv(struct strbuf *sb, const char *gitdir);
 int get_common_dir(struct strbuf *sb, const char *gitdir);
-const char *get_git_namespace(void);
-const char *strip_namespace(const char *namespaced_ref);
-const char *get_git_work_tree(void);
 
 /*
  * Return true if the given path is a git directory; note that this _just_
@@ -578,10 +490,6 @@ const char *read_gitfile_gently(const char *path, int *return_error_code);
 const char *resolve_gitdir_gently(const char *suspect, int *return_error_code);
 #define resolve_gitdir(path) resolve_gitdir_gently((path), NULL)
 
-void set_git_work_tree(const char *tree);
-
-#define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"
-
 void setup_work_tree(void);
 /*
  * Find the commondir and gitdir of the repository that contains the current
@@ -840,39 +748,7 @@ void set_alternate_index_output(const char *);
 extern int verify_index_checksum;
 extern int verify_ce_order;
 
-/* Environment bits from configuration mechanism */
-extern int trust_executable_bit;
-extern int trust_ctime;
-extern int check_stat;
 extern int quote_path_fully;
-extern int has_symlinks;
-extern int minimum_abbrev, default_abbrev;
-extern int ignore_case;
-extern int assume_unchanged;
-extern int prefer_symlink_refs;
-extern int warn_ambiguous_refs;
-extern int warn_on_object_refname_ambiguity;
-extern char *apply_default_whitespace;
-extern char *apply_default_ignorewhitespace;
-extern const char *git_attributes_file;
-extern const char *git_hooks_path;
-extern int zlib_compression_level;
-extern int pack_compression_level;
-extern size_t packed_git_window_size;
-extern size_t packed_git_limit;
-extern size_t delta_base_cache_limit;
-extern unsigned long big_file_threshold;
-extern unsigned long pack_size_limit_cfg;
-
-/*
- * Accessors for the core.sharedrepository config which lazy-load the value
- * from the config (if not already set). The "reset" function can be
- * used to unset "set" or cached value, meaning that the value will be loaded
- * fresh from the config file on the next call to get_shared_repository().
- */
-void set_shared_repository(int value);
-int get_shared_repository(void);
-void reset_shared_repository(void);
 
 /*
  * These values are used to help identify parts of a repository to fsync.
@@ -930,57 +806,6 @@ enum fsync_method {
 };
 
 extern enum fsync_method fsync_method;
-extern int core_preload_index;
-extern int precomposed_unicode;
-extern int protect_hfs;
-extern int protect_ntfs;
-
-extern int core_apply_sparse_checkout;
-extern int core_sparse_checkout_cone;
-extern int sparse_expect_files_outside_of_patterns;
-
-/*
- * Returns the boolean value of $GIT_OPTIONAL_LOCKS (or the default value).
- */
-int use_optional_locks(void);
-
-enum log_refs_config {
-       LOG_REFS_UNSET = -1,
-       LOG_REFS_NONE = 0,
-       LOG_REFS_NORMAL,
-       LOG_REFS_ALWAYS
-};
-extern enum log_refs_config log_all_ref_updates;
-
-enum rebase_setup_type {
-       AUTOREBASE_NEVER = 0,
-       AUTOREBASE_LOCAL,
-       AUTOREBASE_REMOTE,
-       AUTOREBASE_ALWAYS
-};
-
-enum push_default_type {
-       PUSH_DEFAULT_NOTHING = 0,
-       PUSH_DEFAULT_MATCHING,
-       PUSH_DEFAULT_SIMPLE,
-       PUSH_DEFAULT_UPSTREAM,
-       PUSH_DEFAULT_CURRENT,
-       PUSH_DEFAULT_UNSPECIFIED
-};
-
-extern enum rebase_setup_type autorebase;
-extern enum push_default_type push_default;
-
-enum object_creation_mode {
-       OBJECT_CREATION_USES_HARDLINKS = 0,
-       OBJECT_CREATION_USES_RENAMES = 1
-};
-
-extern enum object_creation_mode object_creation_mode;
-
-extern char *notes_ref_name;
-
-extern int grafts_replace_parents;
 
 /*
  * GIT_REPO_VERSION is the version we write by default. The
@@ -989,8 +814,6 @@ extern int grafts_replace_parents;
  */
 #define GIT_REPO_VERSION 0
 #define GIT_REPO_VERSION_READ 1
-extern int repository_format_precious_objects;
-extern int repository_format_worktree_config;
 
 /*
  * You _have_ to initialize a `struct repository_format` using
@@ -1362,21 +1185,6 @@ struct pack_entry {
        struct packed_git *p;
 };
 
-/*
- * Create a temporary file rooted in the object database directory, or
- * die on failure. The filename is taken from "pattern", which should have the
- * usual "XXXXXX" trailer, and the resulting filename is written into the
- * "template" buffer. Returns the open descriptor.
- */
-int odb_mkstemp(struct strbuf *temp_filename, const char *pattern);
-
-/*
- * Create a pack .keep file named "name" (which should generally be the output
- * of odb_pack_name). Returns a file descriptor opened for writing, or -1 on
- * error.
- */
-int odb_pack_keep(const char *name);
-
 /*
  * Set this to 0 to prevent oid_object_info_extended() from fetching missing
  * blobs. This has a difference only if extensions.partialClone is set.
@@ -1388,11 +1196,6 @@ extern int fetch_if_missing;
 /* Dumb servers support */
 int update_server_info(int);
 
-const char *get_log_output_encoding(void);
-const char *get_commit_output_encoding(void);
-
-extern const char *git_commit_encoding;
-extern const char *git_log_output_encoding;
 extern const char *git_mailmap_file;
 extern const char *git_mailmap_blob;
 
@@ -1429,10 +1232,6 @@ int decimal_width(uintmax_t);
 int check_pager_config(const char *cmd);
 void prepare_pager_args(struct child_process *, const char *pager);
 
-extern const char *editor_program;
-extern const char *askpass_program;
-extern const char *excludes_file;
-
 /* base85 */
 int decode_85(char *dst, const char *line, int linelen);
 void encode_85(char *buf, const unsigned char *data, int bytes);
@@ -1536,10 +1335,4 @@ void stat_validity_update(struct stat_validity *sv, int fd);
 
 int versioncmp(const char *s1, const char *s2);
 
-/*
- * Should we print an ellipsis after an abbreviated SHA-1 value
- * when doing diff-raw output or indicating a detached HEAD?
- */
-int print_sha1_ellipsis(void);
-
 #endif /* CACHE_H */

diff --git a/combine-diff.c b/combine-diff.c
index 91051dc3258925a10d6de5d67101720376b8d630..3758e47c4f4965f28e4ed41bcd2b72a2f6995432 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -4,6 +4,7 @@
 #include "blob.h"
 #include "diff.h"
 #include "diffcore.h"
+#include "environment.h"
 #include "hex.h"
 #include "quote.h"
 #include "xdiff-interface.h"

diff --git a/compat/mingw.c b/compat/mingw.c
index d48899bf7b494ec2446a9b019f0ddd81644a1399..94c5a1daa40cde53093b62f0c2c3c67da12ffd9e 100644 (file)
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -11,6 +11,7 @@
 #include "../alloc.h"
 #include "win32/lazyload.h"
 #include "../config.h"
+#include "../environment.h"
 #include "../wrapper.h"
 #include "dir.h"
 #include "gettext.h"

diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c
index 56d36cdf22a8a9b753bb2728447af89517ae294b..8a9881db077320c292714595714f1604462c1504 100644 (file)
--- a/compat/precompose_utf8.c
+++ b/compat/precompose_utf8.c
@@ -7,6 +7,7 @@
 
 #include "cache.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "utf8.h"
 #include "precompose_utf8.h"

diff --git a/connect.c b/connect.c
index f3b159bf441ae39dbfc6a09dca8d8fda5757a2a6..737dd906f729e51d030292ea229aafa32c90d825 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -1,6 +1,7 @@
 #include "git-compat-util.h"
 #include "cache.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "pkt-line.h"

diff --git a/daemon.c b/daemon.c
index e35604e194cf92868fb5b8bd1b4e09c5d6d96996..b56a8f9717d68d0cdc4cf38316eac2ccc4fcac13 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -2,6 +2,7 @@
 #include "abspath.h"
 #include "alloc.h"
 #include "config.h"
+#include "environment.h"
 #include "pkt-line.h"
 #include "run-command.h"
 #include "strbuf.h"

diff --git a/diff.c b/diff.c
index 1b0b24c21c3ab0953a50e59bf7ed5cbb7845587d..dcf1a940942c22ad1d0c8ee971395c33cb40cbe7 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -5,6 +5,7 @@
 #include "abspath.h"
 #include "alloc.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "tempfile.h"
 #include "quote.h"

diff --git a/dir.c b/dir.c
index b57c770e68b025ce64b3e3eff3699188f511b35e..06f8aa3c01bef0cb6b31d3b1ca30d3ef96cf8989 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -10,6 +10,7 @@
 #include "alloc.h"
 #include "config.h"
 #include "dir.h"
+#include "environment.h"
 #include "gettext.h"
 #include "object-store.h"
 #include "attr.h"

diff --git a/editor.c b/editor.c
index 2d3e6be64e4a0c7241945961986f5a9042ed7e3c..d632d7906608732a1059d197d7f06a62e1f55ed2 100644 (file)
--- a/editor.c
+++ b/editor.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "abspath.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "strbuf.h"
 #include "strvec.h"

diff --git a/entry.c b/entry.c
index 70212af260b53822ad72b169a6601a8e98a95ad0..750c1f6b2f4cd2de20872b30ddfdcdbb10d746a9 100644 (file)
--- a/entry.c
+++ b/entry.c
@@ -2,6 +2,7 @@
 #include "blob.h"
 #include "object-store.h"
 #include "dir.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "streaming.h"

diff --git a/environment.h b/environment.h
index a26931556af11402ad9478023d2fc3ce216edeb9..a63f0c6a24f79703383826ecc68b30fdd014c2c3 100644 (file)
--- a/environment.h
+++ b/environment.h
@@ -3,6 +3,8 @@
 
 #include "strvec.h"
 
+struct repository;
+
 /*
  * The character that begins a commented line in user-editable file
  * that is subject to stripspace.
@@ -16,4 +18,215 @@ extern int auto_comment_line_char;
  */
 const char *getenv_safe(struct strvec *argv, const char *name);
 
+/* Double-check local_repo_env below if you add to this list. */
+#define GIT_DIR_ENVIRONMENT "GIT_DIR"
+#define GIT_COMMON_DIR_ENVIRONMENT "GIT_COMMON_DIR"
+#define GIT_NAMESPACE_ENVIRONMENT "GIT_NAMESPACE"
+#define GIT_WORK_TREE_ENVIRONMENT "GIT_WORK_TREE"
+#define GIT_PREFIX_ENVIRONMENT "GIT_PREFIX"
+#define DEFAULT_GIT_DIR_ENVIRONMENT ".git"
+#define DB_ENVIRONMENT "GIT_OBJECT_DIRECTORY"
+#define INDEX_ENVIRONMENT "GIT_INDEX_FILE"
+#define GRAFT_ENVIRONMENT "GIT_GRAFT_FILE"
+#define GIT_SHALLOW_FILE_ENVIRONMENT "GIT_SHALLOW_FILE"
+#define TEMPLATE_DIR_ENVIRONMENT "GIT_TEMPLATE_DIR"
+#define CONFIG_ENVIRONMENT "GIT_CONFIG"
+#define CONFIG_DATA_ENVIRONMENT "GIT_CONFIG_PARAMETERS"
+#define CONFIG_COUNT_ENVIRONMENT "GIT_CONFIG_COUNT"
+#define EXEC_PATH_ENVIRONMENT "GIT_EXEC_PATH"
+#define CEILING_DIRECTORIES_ENVIRONMENT "GIT_CEILING_DIRECTORIES"
+#define NO_REPLACE_OBJECTS_ENVIRONMENT "GIT_NO_REPLACE_OBJECTS"
+#define GIT_REPLACE_REF_BASE_ENVIRONMENT "GIT_REPLACE_REF_BASE"
+#define GITATTRIBUTES_FILE ".gitattributes"
+#define INFOATTRIBUTES_FILE "info/attributes"
+#define ATTRIBUTE_MACRO_PREFIX "[attr]"
+#define GITMODULES_FILE ".gitmodules"
+#define GITMODULES_INDEX ":.gitmodules"
+#define GITMODULES_HEAD "HEAD:.gitmodules"
+#define GIT_NOTES_REF_ENVIRONMENT "GIT_NOTES_REF"
+#define GIT_NOTES_DEFAULT_REF "refs/notes/commits"
+#define GIT_NOTES_DISPLAY_REF_ENVIRONMENT "GIT_NOTES_DISPLAY_REF"
+#define GIT_NOTES_REWRITE_REF_ENVIRONMENT "GIT_NOTES_REWRITE_REF"
+#define GIT_NOTES_REWRITE_MODE_ENVIRONMENT "GIT_NOTES_REWRITE_MODE"
+#define GIT_LITERAL_PATHSPECS_ENVIRONMENT "GIT_LITERAL_PATHSPECS"
+#define GIT_GLOB_PATHSPECS_ENVIRONMENT "GIT_GLOB_PATHSPECS"
+#define GIT_NOGLOB_PATHSPECS_ENVIRONMENT "GIT_NOGLOB_PATHSPECS"
+#define GIT_ICASE_PATHSPECS_ENVIRONMENT "GIT_ICASE_PATHSPECS"
+#define GIT_QUARANTINE_ENVIRONMENT "GIT_QUARANTINE_PATH"
+#define GIT_OPTIONAL_LOCKS_ENVIRONMENT "GIT_OPTIONAL_LOCKS"
+#define GIT_TEXT_DOMAIN_DIR_ENVIRONMENT "GIT_TEXTDOMAINDIR"
+
+/*
+ * Environment variable used in handshaking the wire protocol.
+ * Contains a colon ':' separated list of keys with optional values
+ * 'key[=value]'.  Presence of unknown keys and values must be
+ * ignored.
+ */
+#define GIT_PROTOCOL_ENVIRONMENT "GIT_PROTOCOL"
+/* HTTP header used to handshake the wire protocol */
+#define GIT_PROTOCOL_HEADER "Git-Protocol"
+
+/*
+ * This environment variable is expected to contain a boolean indicating
+ * whether we should or should not treat:
+ *
+ *   GIT_DIR=foo.git git ...
+ *
+ * as if GIT_WORK_TREE=. was given. It's not expected that users will make use
+ * of this, but we use it internally to communicate to sub-processes that we
+ * are in a bare repo. If not set, defaults to true.
+ */
+#define GIT_IMPLICIT_WORK_TREE_ENVIRONMENT "GIT_IMPLICIT_WORK_TREE"
+
+/*
+ * Repository-local GIT_* environment variables; these will be cleared
+ * when git spawns a sub-process that runs inside another repository.
+ * The array is NULL-terminated, which makes it easy to pass in the "env"
+ * parameter of a run-command invocation, or to do a simple walk.
+ */
+extern const char * const local_repo_env[];
+
+void setup_git_env(const char *git_dir);
+
+/*
+ * Returns true iff we have a configured git repository (either via
+ * setup_git_directory, or in the environment via $GIT_DIR).
+ */
+int have_git_dir(void);
+
+extern int is_bare_repository_cfg;
+int is_bare_repository(void);
+extern char *git_work_tree_cfg;
+const char *get_git_dir(void);
+const char *get_git_common_dir(void);
+const char *get_object_directory(void);
+char *get_index_file(void);
+char *get_graft_file(struct repository *r);
+void set_git_dir(const char *path, int make_realpath);
+const char *get_git_namespace(void);
+const char *strip_namespace(const char *namespaced_ref);
+const char *get_git_work_tree(void);
+void set_git_work_tree(const char *tree);
+
+#define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"
+
+/* Environment bits from configuration mechanism */
+extern int trust_executable_bit;
+extern int trust_ctime;
+extern int check_stat;
+extern int has_symlinks;
+extern int minimum_abbrev, default_abbrev;
+extern int ignore_case;
+extern int assume_unchanged;
+extern int prefer_symlink_refs;
+extern int warn_ambiguous_refs;
+extern int warn_on_object_refname_ambiguity;
+extern char *apply_default_whitespace;
+extern char *apply_default_ignorewhitespace;
+extern const char *git_attributes_file;
+extern const char *git_hooks_path;
+extern int zlib_compression_level;
+extern int pack_compression_level;
+extern size_t packed_git_window_size;
+extern size_t packed_git_limit;
+extern size_t delta_base_cache_limit;
+extern unsigned long big_file_threshold;
+extern unsigned long pack_size_limit_cfg;
+
+/*
+ * Accessors for the core.sharedrepository config which lazy-load the value
+ * from the config (if not already set). The "reset" function can be
+ * used to unset "set" or cached value, meaning that the value will be loaded
+ * fresh from the config file on the next call to get_shared_repository().
+ */
+void set_shared_repository(int value);
+int get_shared_repository(void);
+void reset_shared_repository(void);
+
+extern int core_preload_index;
+extern int precomposed_unicode;
+extern int protect_hfs;
+extern int protect_ntfs;
+
+extern int core_apply_sparse_checkout;
+extern int core_sparse_checkout_cone;
+extern int sparse_expect_files_outside_of_patterns;
+
+/*
+ * Returns the boolean value of $GIT_OPTIONAL_LOCKS (or the default value).
+ */
+int use_optional_locks(void);
+
+enum log_refs_config {
+       LOG_REFS_UNSET = -1,
+       LOG_REFS_NONE = 0,
+       LOG_REFS_NORMAL,
+       LOG_REFS_ALWAYS
+};
+extern enum log_refs_config log_all_ref_updates;
+
+enum rebase_setup_type {
+       AUTOREBASE_NEVER = 0,
+       AUTOREBASE_LOCAL,
+       AUTOREBASE_REMOTE,
+       AUTOREBASE_ALWAYS
+};
+
+enum push_default_type {
+       PUSH_DEFAULT_NOTHING = 0,
+       PUSH_DEFAULT_MATCHING,
+       PUSH_DEFAULT_SIMPLE,
+       PUSH_DEFAULT_UPSTREAM,
+       PUSH_DEFAULT_CURRENT,
+       PUSH_DEFAULT_UNSPECIFIED
+};
+
+extern enum rebase_setup_type autorebase;
+extern enum push_default_type push_default;
+
+enum object_creation_mode {
+       OBJECT_CREATION_USES_HARDLINKS = 0,
+       OBJECT_CREATION_USES_RENAMES = 1
+};
+
+extern enum object_creation_mode object_creation_mode;
+
+extern char *notes_ref_name;
+
+extern int grafts_replace_parents;
+
+extern int repository_format_precious_objects;
+extern int repository_format_worktree_config;
+
+/*
+ * Create a temporary file rooted in the object database directory, or
+ * die on failure. The filename is taken from "pattern", which should have the
+ * usual "XXXXXX" trailer, and the resulting filename is written into the
+ * "template" buffer. Returns the open descriptor.
+ */
+int odb_mkstemp(struct strbuf *temp_filename, const char *pattern);
+
+/*
+ * Create a pack .keep file named "name" (which should generally be the output
+ * of odb_pack_name). Returns a file descriptor opened for writing, or -1 on
+ * error.
+ */
+int odb_pack_keep(const char *name);
+
+const char *get_log_output_encoding(void);
+const char *get_commit_output_encoding(void);
+
+extern const char *git_commit_encoding;
+extern const char *git_log_output_encoding;
+
+extern const char *editor_program;
+extern const char *askpass_program;
+extern const char *excludes_file;
+
+/*
+ * Should we print an ellipsis after an abbreviated SHA-1 value
+ * when doing diff-raw output or indicating a detached HEAD?
+ */
+int print_sha1_ellipsis(void);
+
 #endif

diff --git a/exec-cmd.c b/exec-cmd.c
index 042d9247a5bdd4d45fb44c29a6a28e3284ec89f2..fae0d4b244a9d37cafb8f984311b0259bf702898 100644 (file)
--- a/exec-cmd.c
+++ b/exec-cmd.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "abspath.h"
+#include "environment.h"
 #include "exec-cmd.h"
 #include "gettext.h"
 #include "quote.h"

diff --git a/fetch-pack.c b/fetch-pack.c
index c1190801405715edcdeeccd46053cda19e208f57..c453a4168f9f9df601c77a417cf87f4b15e3dade 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -2,6 +2,7 @@
 #include "alloc.h"
 #include "repository.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "lockfile.h"

diff --git a/fsmonitor.c b/fsmonitor.c
index a5b9e75437b5ec7d485eaba4795f21e53fb77122..c956a347a27a8a907deaba3030f8a725f030e3f3 100644 (file)
--- a/fsmonitor.c
+++ b/fsmonitor.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "config.h"
 #include "dir.h"
+#include "environment.h"
 #include "ewah/ewok.h"
 #include "fsmonitor.h"
 #include "fsmonitor-ipc.h"

diff --git a/gettext.c b/gettext.c
index 3e7b3baabc6d49c172ba6cc7818e6efbda76afc0..85d3d3424eb2c2a0f5ca2947916ed88d25f6edf0 100644 (file)
--- a/gettext.c
+++ b/gettext.c
@@ -4,6 +4,7 @@
 
 #include "cache.h"
 #include "abspath.h"
+#include "environment.h"
 #include "exec-cmd.h"
 #include "gettext.h"
 #include "strbuf.h"

diff --git a/git.c b/git.c
index 22ce4f14b656c8e04580cef3ff66f916e0cff975..b24c105e83f96a52c2276d15353878c9da4d4fc6 100644 (file)
--- a/git.c
+++ b/git.c
@@ -1,5 +1,6 @@
 #include "builtin.h"
 #include "config.h"
+#include "environment.h"
 #include "exec-cmd.h"
 #include "gettext.h"
 #include "help.h"

diff --git a/http-backend.c b/http-backend.c
index 42e6c2596e94497b3a8f30fd1a602f266bebcedc..042ccf12e8ccfbb4e05e07cf7efa61a5f1a4dc80 100644 (file)
--- a/http-backend.c
+++ b/http-backend.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "alloc.h"
 #include "config.h"
+#include "environment.h"
 #include "hex.h"
 #include "repository.h"
 #include "refs.h"

diff --git a/http-push.c b/http-push.c
index 88aa045ecba453eaab7f56c02c54a972ab07fd7c..40373bc4863535e3d042023a6cf508af87577f75 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "environment.h"
 #include "hex.h"
 #include "repository.h"
 #include "commit.h"

diff --git a/log-tree.c b/log-tree.c
index 3adcb576e4cae12052af13d25bcd861c84bd4174..e2bf8d6df75da73172c7e95c279b6b10da82aa74 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -2,6 +2,7 @@
 #include "commit-reach.h"
 #include "config.h"
 #include "diff.h"
+#include "environment.h"
 #include "hex.h"
 #include "object-store.h"
 #include "repository.h"

diff --git a/ls-refs.c b/ls-refs.c
index ae38889bf04663fb65d941094300c9d319b750d4..12cbb40a19836909d1a80ccaa6f590369b424b6e 100644 (file)
--- a/ls-refs.c
+++ b/ls-refs.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "repository.h"

diff --git a/mailmap.c b/mailmap.c
index da2589b08229813963347115a001d8ce6f45ae32..2c6e9b238dd8493171dfb09d9a8cf22c5b985437 100644 (file)
--- a/mailmap.c
+++ b/mailmap.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "environment.h"
 #include "string-list.h"
 #include "mailmap.h"
 #include "object-store.h"

diff --git a/merge-ort.c b/merge-ort.c
index a26cad5f910385951187b6b7808265b7abf8b44c..f3d7c202f5211020118cdf1a844784b383513c3f 100644 (file)
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -26,6 +26,7 @@
 #include "diff.h"
 #include "diffcore.h"
 #include "dir.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "entry.h"

diff --git a/merge-recursive.c b/merge-recursive.c
index f918cea4c695d1e91b48b50a93a6b2e3dd70da56..d5f37724911bcd4da0c53af670ee93646d46fe27 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -17,6 +17,7 @@
 #include "diff.h"
 #include "diffcore.h"
 #include "dir.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "ll-merge.h"

diff --git a/name-hash.c b/name-hash.c
index bb9eae55aca2ff5cfb059bf8c22d4bb3e626d746..2c2861efd1cf3b3cc0b56fb40f531ac467213b46 100644 (file)
--- a/name-hash.c
+++ b/name-hash.c
@@ -6,6 +6,7 @@
  * Copyright (C) 2008 Linus Torvalds
  */
 #include "cache.h"
+#include "environment.h"
 #include "gettext.h"
 #include "thread-utils.h"
 #include "trace2.h"

diff --git a/notes-utils.c b/notes-utils.c
index da08e2e8e5cd2bb23db639144b5bb120cdb614c6..8797271faf10a741561060447941cad26e21d1d0 100644 (file)
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "config.h"
 #include "commit.h"
+#include "environment.h"
 #include "gettext.h"
 #include "refs.h"
 #include "notes-utils.h"

diff --git a/notes.c b/notes.c
index a7187236e981ff0bd4d996bdcfedee6fe6767315..9288c1a0705da3b98c1c9c6e9f88b1170d253fe4 100644 (file)
--- a/notes.c
+++ b/notes.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "config.h"
+#include "environment.h"
 #include "hex.h"
 #include "notes.h"
 #include "object-store.h"

diff --git a/object-file.c b/object-file.c
index bdf68763a50bd9725d3582d3ae69188eb593d3e5..3da6cd688611d68173f1c7650fb8d2dcf4227d9e 100644 (file)
--- a/object-file.c
+++ b/object-file.c
@@ -10,6 +10,7 @@
 #include "abspath.h"
 #include "alloc.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "string-list.h"

diff --git a/object-name.c b/object-name.c
index 2c927bbded3fa96c4503b873b95f384c358285bd..3b0ce8ef05a79da2785d6e699f6134cb7ae24a28 100644 (file)
--- a/object-name.c
+++ b/object-name.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "tag.h"

diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index 7dc7f0ba55e6fd92c18f50861b92f197e0740476..63f16080c9b47b86a92996874b2d6a428dcf9359 100644 (file)
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -1,5 +1,6 @@
 #include "git-compat-util.h"
 #include "alloc.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "object-store.h"

diff --git a/pack-check.c b/pack-check.c
index 7ed594d6679744759956c200d63f09219ed0537b..6974e40a95826e39b3f102d1653b391c9e87cde5 100644 (file)
--- a/pack-check.c
+++ b/pack-check.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "environment.h"
 #include "hex.h"
 #include "repository.h"
 #include "pack.h"

diff --git a/pack-write.c b/pack-write.c
index 87156f89d2b0fd4708fd3c2cb5915f190ca6a5d1..f1714054951e158ca920a4a17a831914962f557e 100644 (file)
--- a/pack-write.c
+++ b/pack-write.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "pack.h"

diff --git a/packfile.c b/packfile.c
index 8c117ccee27c9f8bdfa80c7d15127fac3481ee68..4b5b841d04687678aee4014e647a2d44ecd25428 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -1,5 +1,6 @@
 #include "git-compat-util.h"
 #include "alloc.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "list.h"

diff --git a/parse-options-cb.c b/parse-options-cb.c
index fbf4b010195a141bb847facf77aaf3c501dc7e9e..15d008c3daf291ce9c65769e8cac0cff31dabf0d 100644 (file)
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -4,6 +4,7 @@
 #include "cache.h"
 #include "commit.h"
 #include "color.h"
+#include "environment.h"
 #include "gettext.h"
 #include "string-list.h"
 #include "strvec.h"

diff --git a/path.c b/path.c
index 3976c0d7ace006a8080c1d96279d0cfb7acb4623..5d5a15c13d61cbf31ad3a3410110d26ad55c8f15 100644 (file)
--- a/path.c
+++ b/path.c
@@ -3,6 +3,7 @@
  */
 #include "cache.h"
 #include "abspath.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "repository.h"

diff --git a/pathspec.c b/pathspec.c
index 53763e272f511b036f05592896324831be258986..5fb7b5f26c985eaa1104abe537ada5816a677c13 100644 (file)
--- a/pathspec.c
+++ b/pathspec.c
@@ -2,6 +2,7 @@
 #include "abspath.h"
 #include "config.h"
 #include "dir.h"
+#include "environment.h"
 #include "gettext.h"
 #include "pathspec.h"
 #include "attr.h"

diff --git a/preload-index.c b/preload-index.c
index 4b45e1d6912f8220c8fc60de88f729f835b7cd68..52544d004e76a011e5078fbc14037bd74a039553 100644 (file)
--- a/preload-index.c
+++ b/preload-index.c
@@ -4,6 +4,7 @@
 #include "cache.h"
 #include "pathspec.h"
 #include "dir.h"
+#include "environment.h"
 #include "fsmonitor.h"
 #include "gettext.h"
 #include "config.h"

diff --git a/pretty.c b/pretty.c
index 9d7922dcc603a1d7235ad0cb035f638ccaf5a497..2b6d0f52c9ff60ca4fa11579a842cb19304ff922 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -2,6 +2,7 @@
 #include "alloc.h"
 #include "config.h"
 #include "commit.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "utf8.h"

diff --git a/prompt.c b/prompt.c
index 50df17279d1d5b2615fb8dd5a13853a2ea87b8eb..ba10813b313320b65b367c43d5571067240a0ee7 100644 (file)
--- a/prompt.c
+++ b/prompt.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "config.h"
+#include "environment.h"
 #include "run-command.h"
 #include "strbuf.h"
 #include "prompt.h"

diff --git a/protocol.c b/protocol.c
index c53f7df5be4abae7a4f5792f42e4c4ecac006e9a..bdb32e1eeb62473b9ae309b266c7f508a480c354 100644 (file)
--- a/protocol.c
+++ b/protocol.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "config.h"
+#include "environment.h"
 #include "protocol.h"
 
 static enum protocol_version parse_protocol_version(const char *value)

diff --git a/prune-packed.c b/prune-packed.c
index cff5ad569c7b1b8c6f243cb4fabf159573bb459a..5a57072a7ac6d8c7b6d10b0b6715ae66bef8a206 100644 (file)
--- a/prune-packed.c
+++ b/prune-packed.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "environment.h"
 #include "gettext.h"
 #include "object-store.h"
 #include "packfile.h"

diff --git a/range-diff.c b/range-diff.c
index 1bfc612e2741ed74a9e2c0e0fbb104ccd043832b..815fb24c9cef9982c5e3366d4de15ca559d96866 100644 (file)
--- a/range-diff.c
+++ b/range-diff.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "environment.h"
 #include "gettext.h"
 #include "range-diff.h"
 #include "string-list.h"

diff --git a/read-cache.c b/read-cache.c
index 9a8d5fe97ed4aa06a0f4fd0579d2376f6a615f46..34567c1d550c5a8825083cbd803cf38113880ee4 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -18,6 +18,7 @@
 #include "tree.h"
 #include "commit.h"
 #include "blob.h"
+#include "environment.h"
 #include "gettext.h"
 #include "resolve-undo.h"
 #include "run-command.h"

diff --git a/rebase-interactive.c b/rebase-interactive.c
index 7c885c35bfdd1be3afbe5c893c95d9ddc000a97e..a83334dd56465a32bd6ed8f44a49596b68e0092d 100644 (file)
--- a/rebase-interactive.c
+++ b/rebase-interactive.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "commit.h"
+#include "environment.h"
 #include "gettext.h"
 #include "sequencer.h"
 #include "rebase-interactive.h"

diff --git a/ref-filter.c b/ref-filter.c
index 9a830bedef0f8eedfcc1caaf7aa8d44b0caa1a8a..1489fbfe4ae74ae29e9704cb88d312ae696b10e4 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "alloc.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "parse-options.h"

diff --git a/refs.c b/refs.c
index 385051752f195dd0db071753c96e81bdb955b691..04520e5a6b82fb566d1244c8da9ac573576d8003 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -5,6 +5,7 @@
 #include "cache.h"
 #include "alloc.h"
 #include "config.h"
+#include "environment.h"
 #include "hashmap.h"
 #include "gettext.h"
 #include "hex.h"

diff --git a/refs/files-backend.c b/refs/files-backend.c
index eb14d124e3f7ba34d5c16bb9c832e1c9e1c978ec..0c3138ede8f7ed0c01d7cc76f6415cd53f631158 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1,5 +1,6 @@
 #include "../cache.h"
 #include "../config.h"
+#include "../environment.h"
 #include "../gettext.h"
 #include "../hex.h"
 #include "../refs.h"

diff --git a/remote-curl.c b/remote-curl.c
index 943cd6fe6cdedabfe95108a6f9010ee988c61f68..eb382a1e35d4ec3583b39fde33291bad5dfc721d 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -1,6 +1,7 @@
 #include "git-compat-util.h"
 #include "alloc.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "remote.h"

diff --git a/remote.c b/remote.c
index 2bae247a0a4c1a31a5c9cc270fee47ebdf3d29c5..aeca3ff81363f895fe2fa399fb14c7753ccad538 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -2,6 +2,7 @@
 #include "abspath.h"
 #include "alloc.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "remote.h"

diff --git a/revision.c b/revision.c
index 7423e23327b55da147b2894e76e71d369f8a3e63..53fdeef0787bde16e472c40928fbbdfaa944af4c 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1,6 +1,7 @@
 #include "git-compat-util.h"
 #include "alloc.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "object-store.h"

diff --git a/run-command.c b/run-command.c
index 2c8b4cd9bfc90b3fba6a0512a1bf73e29e4fc078..614d48fa9a231e4192485d2b1bc75fae91542845 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "run-command.h"
+#include "environment.h"
 #include "exec-cmd.h"
 #include "gettext.h"
 #include "sigchain.h"

diff --git a/server-info.c b/server-info.c
index ae96d784e5329a291bcd9384a10785c7736a93b0..355b6e01a52a0ce25b1a9fdf145749b37085f852 100644 (file)
--- a/server-info.c
+++ b/server-info.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "alloc.h"
 #include "dir.h"
+#include "environment.h"
 #include "hex.h"
 #include "repository.h"
 #include "refs.h"

diff --git a/setup.c b/setup.c
index 8f385d9f29bf1c5944ca9dc81fc11a6fce8717a7..cfdc849a78c601e802ba4a3faddf1a6f6fe921e6 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "abspath.h"
+#include "environment.h"
 #include "gettext.h"
 #include "repository.h"
 #include "config.h"

diff --git a/sparse-index.c b/sparse-index.c
index fdae9011b8eb6d90c00a115b6954467b351e71d2..886054729e5e343f664d81da5c5ad6b48cf06e8a 100644 (file)
--- a/sparse-index.c
+++ b/sparse-index.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "alloc.h"
+#include "environment.h"
 #include "gettext.h"
 #include "repository.h"
 #include "sparse-index.h"

diff --git a/streaming.c b/streaming.c
index 6c69f59504569cc50e9a828b5dea5a91f1eef9ae..024fd796b7d02f48452c6cf541e6ebb2ccdadd74 100644 (file)
--- a/streaming.c
+++ b/streaming.c
@@ -2,6 +2,7 @@
  * Copyright (c) 2011, Google Inc.
  */
 #include "cache.h"
+#include "environment.h"
 #include "streaming.h"
 #include "repository.h"
 #include "object-store.h"

diff --git a/submodule-config.c b/submodule-config.c
index 38663801aa48c6cd8ade292fafab79d202205210..28fdfddccfbacfc0faecdd06b56a855857c33e7d 100644 (file)
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "alloc.h"
 #include "dir.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "repository.h"

diff --git a/submodule.c b/submodule.c
index 13ff333f68cf08f668754a9089584847bff88038..acf030b95e4c47a1df065e775fd936c5059bf44a 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -8,6 +8,7 @@
 #include "dir.h"
 #include "diff.h"
 #include "commit.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "revision.h"

diff --git a/t/helper/test-fast-rebase.c b/t/helper/test-fast-rebase.c
index 68bbc41b330bf1f9c19240685bdd984344fb266f..627a6bdc3d0f64a48cb640483f95e57b54ef217a 100644 (file)
--- a/t/helper/test-fast-rebase.c
+++ b/t/helper/test-fast-rebase.c
@@ -15,6 +15,7 @@
 #include "cache.h"
 #include "cache-tree.h"
 #include "commit.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "lockfile.h"

diff --git a/t/helper/test-lazy-init-name-hash.c b/t/helper/test-lazy-init-name-hash.c
index ab86c14c8ba56b513ea302842ad9fbf638507404..2b678a4579398e5502e1367d999f72b3214e2238 100644 (file)
--- a/t/helper/test-lazy-init-name-hash.c
+++ b/t/helper/test-lazy-init-name-hash.c
@@ -1,6 +1,7 @@
 #define USE_THE_INDEX_VARIABLE
 #include "test-tool.h"
 #include "cache.h"
+#include "environment.h"
 #include "parse-options.h"
 
 static int single;

diff --git a/t/helper/test-path-utils.c b/t/helper/test-path-utils.c
index d3d00dc34faca163d19d32a8f9e914b55b1847e2..cc266e3ec096bb740da9f327ff1a6ef369a727c5 100644 (file)
--- a/t/helper/test-path-utils.c
+++ b/t/helper/test-path-utils.c
@@ -1,6 +1,7 @@
 #include "test-tool.h"
 #include "cache.h"
 #include "abspath.h"
+#include "environment.h"
 #include "string-list.h"
 #include "utf8.h"
 

diff --git a/t/helper/test-repository.c b/t/helper/test-repository.c
index 10a6dfc2160f6628db768db3fc7968fa62971815..c444775eb0f46cabd2bea37f60d529d22395c59c 100644 (file)
--- a/t/helper/test-repository.c
+++ b/t/helper/test-repository.c
@@ -3,6 +3,7 @@
 #include "commit-graph.h"
 #include "commit.h"
 #include "config.h"
+#include "environment.h"
 #include "hex.h"
 #include "object-store.h"
 #include "object.h"

diff --git a/tag.c b/tag.c
index 3408bb9433f3b83a763a683fe483b9107140c616..39434231799797113bb635fb3a0fc43e78cd137b 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "environment.h"
 #include "tag.h"
 #include "object-store.h"
 #include "commit.h"

diff --git a/tmp-objdir.c b/tmp-objdir.c
index fff15cb6b5cc0c4c61c4c034f7fe1e2a312869cf..5adad1925d1a051c38c08f911dd6d5824e5de305 100644 (file)
--- a/tmp-objdir.c
+++ b/tmp-objdir.c
@@ -3,6 +3,7 @@
 #include "abspath.h"
 #include "chdir-notify.h"
 #include "dir.h"
+#include "environment.h"
 #include "sigchain.h"
 #include "string-list.h"
 #include "strbuf.h"

diff --git a/trace.c b/trace.c
index de004f62988ab6510af8bdcab9667820f01540db..9c85b71ec6a241be2ac8cd8dbf1995eba7363d26 100644 (file)
--- a/trace.c
+++ b/trace.c
@@ -23,6 +23,7 @@
 
 #include "cache.h"
 #include "abspath.h"
+#include "environment.h"
 #include "quote.h"
 #include "wrapper.h"
 

diff --git a/transport-helper.c b/transport-helper.c
index 09048eab484744948fc283ca814add048698a3bb..3313bb7409973fc3960593756b7a7829a9875e22 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -4,6 +4,7 @@
 #include "run-command.h"
 #include "commit.h"
 #include "diff.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "revision.h"

diff --git a/transport.c b/transport.c
index c6179b801e8b858bc5decb2bcc29ab6ad692ce46..4f06ccbee05677edef498c3db229c645acbc9e46 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "alloc.h"
 #include "config.h"
+#include "environment.h"
 #include "hex.h"
 #include "transport.h"
 #include "hook.h"

diff --git a/unpack-trees.c b/unpack-trees.c
index 84e0d2e8afe51b0dddbee0971f439f79eee9fcbf..0ff4bbc6b96f46492c506bfec6cbc840656edc13 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -3,6 +3,7 @@
 #include "repository.h"
 #include "config.h"
 #include "dir.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "tree.h"

diff --git a/upload-pack.c b/upload-pack.c
index eea9e6a6e8cbc5d883525e49a2f8cba02e32fcab..1155f795382c23e3209922b3a9a9e24b4e444d90 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "refs.h"

diff --git a/worktree.c b/worktree.c
index fe4345012c475745addfa77667d219d926f205d9..c2671b0cdf38cb68c41fec5972897d4933e97dbb 100644 (file)
--- a/worktree.c
+++ b/worktree.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "abspath.h"
 #include "alloc.h"
+#include "environment.h"
 #include "gettext.h"
 #include "repository.h"
 #include "refs.h"