builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

Instead of including USE_THE_REPOSITORY_VARIABLE by default on every
builtin, remove it from builtin.h and add it to all the builtins that
include builtin.h (by definition, that means all builtins/*.c).

Also, remove the include statement for repository.h since it gets
brought in through builtin.h.

The next step will be to migrate each builtin
from having to use the_repository.

Signed-off-by: John Cai <johncai86@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin.h b/builtin.h
index fc6fc8ffed8f6d71256decef010dc10123bca4b8..f7b166b33484d312923473040c2ccac110865d51 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -1,14 +1,6 @@
 #ifndef BUILTIN_H
 #define BUILTIN_H
 
-/*
- * TODO: Almost all of our builtins access `the_repository` by necessity
- * because they do not get passed a pointer to it. We should adapt the function
- * signature of those main functions to accept a `struct repository *` and then
- * remove the macro here.
- */
-#define USE_THE_REPOSITORY_VARIABLE
-
 #include "git-compat-util.h"
 #include "repository.h"
 

diff --git a/builtin/add.c b/builtin/add.c
index ba331519cac4ebb3372ccd912a5b2e215cf70b82..c893ff48d26bbdaf20f471792bd715e51e6c4797 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006 Linus Torvalds
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "advice.h"
 #include "config.h"
@@ -18,7 +18,6 @@
 #include "preload-index.h"
 #include "diff.h"
 #include "read-cache.h"
-#include "repository.h"
 #include "revision.h"
 #include "bulk-checkin.h"
 #include "strvec.h"

diff --git a/builtin/am.c b/builtin/am.c
index 8c610eed3e66e6e62f18f01df183fd9b67e54d81..7693891fcdeb4c1947b25728a6d296ee6d7690b0 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -4,6 +4,7 @@
  * Based on git-am.sh by Junio C Hamano.
  */
 
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "advice.h"
@@ -38,7 +39,6 @@
 #include "string-list.h"
 #include "pager.h"
 #include "path.h"
-#include "repository.h"
 #include "pretty.h"
 
 /**

diff --git a/builtin/annotate.c b/builtin/annotate.c
index 0abf89ef18641000ba737f3c6582be3225317808..a99179fe4dd9aea68574842abce093f483d20caa 100644 (file)
--- a/builtin/annotate.c
+++ b/builtin/annotate.c
@@ -3,6 +3,8 @@
  *
  * Copyright (C) 2006 Ryan Anderson
  */
+
+#define USE_THE_REPOSITORY_VARIABLE
 #include "git-compat-util.h"
 #include "builtin.h"
 #include "strvec.h"

diff --git a/builtin/apply.c b/builtin/apply.c
index ca0bb97df40963853246ad4171971317dacf56b4..84f1863d3ac3490bebbb746c61a2d695de09c848 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -1,6 +1,6 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "gettext.h"
-#include "repository.h"
 #include "hash.h"
 #include "apply.h"
 

diff --git a/builtin/archive.c b/builtin/archive.c
index de59c3ae97a2ec35b36318271320ad709109396c..22f7c63529fb2eaccac92ec0471cf26f5795a121 100644 (file)
--- a/builtin/archive.c
+++ b/builtin/archive.c
@@ -2,13 +2,13 @@
  * Copyright (c) 2006 Franck Bui-Huu
  * Copyright (c) 2006 Rene Scharfe
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "archive.h"
 #include "gettext.h"
 #include "transport.h"
 #include "parse-options.h"
 #include "pkt-line.h"
-#include "repository.h"
 
 static void create_output_file(const char *output_file)
 {

diff --git a/builtin/bisect.c b/builtin/bisect.c
index b83056df9f4392dfa46737ce31ff98b08d54dd3b..5e91c59c763854a918ac7d779280c7b0cf4f9f1a 100644 (file)
--- a/builtin/bisect.c
+++ b/builtin/bisect.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "copy.h"
 #include "environment.h"

diff --git a/builtin/blame.c b/builtin/blame.c
index 728a62402b5580b4199cd8bf6ba0012a79fef6ea..472dd762f4158df48a0d7c59ae1f0d402e8d664d 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -4,7 +4,7 @@
  * Copyright (c) 2006, 2014 by its authors
  * See COPYING for licensing conditions
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "color.h"
@@ -12,7 +12,6 @@
 #include "environment.h"
 #include "gettext.h"
 #include "hex.h"
-#include "repository.h"
 #include "commit.h"
 #include "diff.h"
 #include "revision.h"

diff --git a/builtin/branch.c b/builtin/branch.c
index 7980d2e83d6c891b60eba5a629356725cac41011..7112459ebd19d78aa05cc1b00728749095880c10 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -4,7 +4,7 @@
  * Copyright (c) 2006 Kristian Høgsberg <krh@redhat.com>
  * Based on git-branch.sh by Junio C Hamano.
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "color.h"

diff --git a/builtin/bugreport.c b/builtin/bugreport.c
index aeab40c4902049ad09b570044f7f03db0b3b4a5f..7c2df035c9cff06f649c2b35394ea3db3d39f469 100644 (file)
--- a/builtin/bugreport.c
+++ b/builtin/bugreport.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "editor.h"

diff --git a/builtin/bundle.c b/builtin/bundle.c
index 97f7f530d0e081562767c29169b20f5605676cf0..cabb20b44b82922919efc55ed18402667f950e4d 100644 (file)
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "gettext.h"
@@ -5,7 +6,6 @@
 #include "strvec.h"
 #include "parse-options.h"
 #include "pkt-line.h"
-#include "repository.h"
 #include "bundle.h"
 
 /*

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index b244b5a1ab6b7c55e5ef5025093c88e75cda2535..b9b754b354f4e991a40d6337b3e19bb408ccb6d9 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "convert.h"

diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index ffd1067558d1157fec34197089a97ff5fbebe1c4..7cf275b8937958ae41947814ec2ccf6c808706cb 100644 (file)
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "attr.h"
@@ -5,7 +6,6 @@
 #include "gettext.h"
 #include "object-name.h"
 #include "quote.h"
-#include "repository.h"
 #include "setup.h"
 #include "parse-options.h"
 #include "write-or-die.h"

diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c
index 70565b9f8921608c172d2aebe781da32e4ec5d7a..7b7831d13a85ff2f87698e444f2f9b3db745d429 100644 (file)
--- a/builtin/check-ignore.c
+++ b/builtin/check-ignore.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "dir.h"
@@ -5,7 +6,6 @@
 #include "quote.h"
 #include "pathspec.h"
 #include "parse-options.h"
-#include "repository.h"
 #include "submodule.h"
 #include "write-or-die.h"
 

diff --git a/builtin/check-mailmap.c b/builtin/check-mailmap.c
index 87cc036dd146b50f84bb240abe9d06056db86e59..c0610469d40dbb7c140b2863b162ddf71d58e2bb 100644 (file)
--- a/builtin/check-mailmap.c
+++ b/builtin/check-mailmap.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c
index 6874edb4f4102f23a0e543dbb14572c0751ad522..65945171b3fc5fb19e5853d8750a1e9f1f342084 100644 (file)
--- a/builtin/check-ref-format.c
+++ b/builtin/check-ref-format.c
@@ -1,7 +1,7 @@
 /*
  * GIT - The information manager from hell
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "refs.h"
 #include "setup.h"

diff --git a/builtin/checkout--worker.c b/builtin/checkout--worker.c
index f53e10826906be16b6d65ff8bcf9f844a3185eb4..ff6cdccc21dfd246f9bc37fab993e042cffd3960 100644 (file)
--- a/builtin/checkout--worker.c
+++ b/builtin/checkout--worker.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "entry.h"

diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index 98247ff823657aa57c18531f23a4857ee423f228..6dd38eb05d49d6de451a063756b950122c626d21 100644 (file)
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -4,13 +4,12 @@
  * Copyright (C) 2005 Linus Torvalds
  *
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"
 #include "lockfile.h"
 #include "quote.h"
-#include "repository.h"
 #include "cache-tree.h"
 #include "parse-options.h"
 #include "entry.h"

diff --git a/builtin/checkout.c b/builtin/checkout.c
index d3bc48684f9ab4b0f28f6f9e714a2f7751070f93..d6defc36b2bd184c40c683a458790b8478c700c1 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "advice.h"
 #include "branch.h"

diff --git a/builtin/clean.c b/builtin/clean.c
index b5887f877e081dbfaeec34d280ff4f9d5f635850..9c48dd02711c6e60628ab6ac5402d4271ea1a378 100644 (file)
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -5,7 +5,7 @@
  *
  * Based on git-clean.sh by Pavel Roskin
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "config.h"
@@ -14,7 +14,6 @@
 #include "parse-options.h"
 #include "path.h"
 #include "read-cache-ll.h"
-#include "repository.h"
 #include "setup.h"
 #include "string-list.h"
 #include "quote.h"

diff --git a/builtin/clone.c b/builtin/clone.c
index 1b82310ac5b8f65c188621500085ac35a3405344..e77339c84720f244f7789cef55f1cbd97c6ab9c8 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -7,8 +7,9 @@
  *
  * Clone a repository into a different directory that does not yet exist.
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
+
 #include "abspath.h"
 #include "advice.h"
 #include "config.h"

diff --git a/builtin/column.c b/builtin/column.c
index 93f84beeee72f3953f7d8e14c776d77a6641b1f7..50314cc2559e55bae712ad59af849b8816c1dc2e 100644 (file)
--- a/builtin/column.c
+++ b/builtin/column.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index 65ce98d4675a11ed5ad558bda42c6e3a66a32471..81e577c14ae5874188701e7aa540e18d07834199 100644 (file)
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "commit.h"
 #include "config.h"
@@ -5,7 +6,6 @@
 #include "gettext.h"
 #include "hex.h"
 #include "parse-options.h"
-#include "repository.h"
 #include "commit-graph.h"
 #include "object-store-ll.h"
 #include "progress.h"

diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index bd8bf3296ed663bf0ba4ba0dafe326fa1ae25c6b..2ca1a57ebbb23096ba8bee25d999cacb7c62f901 100644 (file)
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -3,13 +3,14 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"
 #include "hex.h"
 #include "object-name.h"
 #include "object-store-ll.h"
-#include "repository.h"
+
 #include "commit.h"
 #include "parse-options.h"
 

diff --git a/builtin/commit.c b/builtin/commit.c
index 768d76ac461ff40cde3f236c640786c5d89f4361..fd1cc42c5a61dbd2e7af921b83ca211ee0568f5f 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -4,7 +4,7 @@
  * Copyright (c) 2007 Kristian Høgsberg <krh@redhat.com>
  * Based on git-commit.sh by Junio C Hamano and Linus Torvalds
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "advice.h"
 #include "config.h"

diff --git a/builtin/config.c b/builtin/config.c
index 841a5d706f41c3e112ae7fe9a6ab85e581e2fb40..faa0ee7d65e79854281c7aa1ebdc93a7f0fff3fe 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -1,10 +1,10 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "config.h"
 #include "color.h"
 #include "editor.h"
 #include "environment.h"
-#include "repository.h"
 #include "gettext.h"
 #include "ident.h"
 #include "parse-options.h"

diff --git a/builtin/count-objects.c b/builtin/count-objects.c
index 6b905da3c3de5811961f94e75a683b8d71d4db46..3d7b289f5970f9eebe8954bb170492d861f22ab0 100644 (file)
--- a/builtin/count-objects.c
+++ b/builtin/count-objects.c
@@ -3,14 +3,13 @@
  *
  * Copyright (c) 2006 Junio C Hamano
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #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 --git a/builtin/credential-cache--daemon.c b/builtin/credential-cache--daemon.c
index 4caaf38b841518bb226ed909342e7747821ecef5..bc22f5c6d2413d91e9fe3ffbc9223b51dfba5bbf 100644 (file)
--- a/builtin/credential-cache--daemon.c
+++ b/builtin/credential-cache--daemon.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "gettext.h"

diff --git a/builtin/credential-cache.c b/builtin/credential-cache.c
index 5de8b9123bf07c848077838b68e24f4ba4541eff..1918c474f025f1a7f7479d51a38c55dc5d1384a0 100644 (file)
--- a/builtin/credential-cache.c
+++ b/builtin/credential-cache.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "credential.h"
 #include "gettext.h"

diff --git a/builtin/credential-store.c b/builtin/credential-store.c
index 128704078e90a38d30f91d2549cafd320ac5f35f..e669e99dbfb9a718ff83aa59f24c307fa35f981e 100644 (file)
--- a/builtin/credential-store.c
+++ b/builtin/credential-store.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/builtin/credential.c b/builtin/credential.c
index 796422c6fe7f7403f5d1cc7d79afb7d90d7ce677..14c8c6608b2fbd7091a11c14537d08783d5c281d 100644 (file)
--- a/builtin/credential.c
+++ b/builtin/credential.c
@@ -1,3 +1,5 @@
+#define USE_THE_REPOSITORY_VARIABLE
+
 #include "git-compat-util.h"
 #include "credential.h"
 #include "builtin.h"

diff --git a/builtin/describe.c b/builtin/describe.c
index 1c1c250fe0c0a73e606d036f46248e842de0674e..7929223c8b2ca321b77d9699fa5e66deaed78676 100644 (file)
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "environment.h"

diff --git a/builtin/diagnose.c b/builtin/diagnose.c
index 66a22d918e68a48a7c31ef3b75335f9a2bad7ab1..5ac7872b998328eb843255acc3bd341416d1242b 100644 (file)
--- a/builtin/diagnose.c
+++ b/builtin/diagnose.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "gettext.h"

diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index 7f4f9bcb3eb1f1f5cd5c1ab5c3e01b0540fa5645..b8ec420f867b3b6f3eb04bf4a5c4a0eb5d9133ee 100644 (file)
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -3,13 +3,13 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "diff.h"
 #include "diff-merges.h"
 #include "commit.h"
 #include "preload-index.h"
-#include "repository.h"
 #include "revision.h"
 
 static const char diff_files_usage[] =

diff --git a/builtin/diff-index.c b/builtin/diff-index.c
index 8abec38592f911c6c09e7889a0115da56951eae9..e87f717d86eb3d7a7931b8d62ab61e4b75572d2a 100644 (file)
--- a/builtin/diff-index.c
+++ b/builtin/diff-index.c
@@ -1,10 +1,10 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "diff.h"
 #include "diff-merges.h"
 #include "commit.h"
 #include "preload-index.h"
-#include "repository.h"
 #include "revision.h"
 #include "setup.h"
 

diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index 841448b023fc1c1d79e482125a971c6446e664cb..715995c46fa07d8f00080ae629986a2c4f25b333 100644 (file)
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "diff.h"
@@ -6,7 +7,6 @@
 #include "hex.h"
 #include "log-tree.h"
 #include "read-cache-ll.h"
-#include "repository.h"
 #include "revision.h"
 #include "tmp-objdir.h"
 #include "tree.h"

diff --git a/builtin/diff.c b/builtin/diff.c
index 499b7872dd4ece6c57a732d5fc26c2f89e6626e1..63e790b229124d771674d487c7465b9de466b469 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2006 Junio C Hamano
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "ewah/ewok.h"

diff --git a/builtin/difftool.c b/builtin/difftool.c
index c8700d67f4d515a35b360c31f422bfa08b3bb086..f7dfa1fd0daac70b1d1867b1ccd1b81d80b86983 100644 (file)
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -11,8 +11,9 @@
  *
  * Copyright (C) 2016 Johannes Schindelin
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
+
 #include "abspath.h"
 #include "config.h"
 #include "copy.h"

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 1bd5949dd2499b350897a5cde2a4e0403310b25e..e17f262e8e4d1c26f6235f1758febaef6fa2e1a0 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2007 Johannes E. Schindelin
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index 4b9e341aa44e09e73abe67499567d26fb0c7ec0c..1e7ab67f6e5f131c2e75c5acfd2eccd6d45d4d54 100644 (file)
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -1,9 +1,9 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "environment.h"
 #include "gettext.h"
 #include "hex.h"
-#include "repository.h"
 #include "config.h"
 #include "lockfile.h"
 #include "object.h"

diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index fddd8a2c1cdd2741ceb9086ea3853f56254d764a..d2c4304d222650e3976aaa5960d8cb0d87d7ea3a 100644 (file)
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "gettext.h"
 #include "hex.h"

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 46ecfc5bc6241ed70416a5e9e297743f1831585f..9e68114b866b7b798158707addb2e9d5a284d34e 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1,13 +1,13 @@
 /*
  * "git fetch"
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "advice.h"
 #include "config.h"
 #include "gettext.h"
 #include "environment.h"
 #include "hex.h"
-#include "repository.h"
 #include "refs.h"
 #include "refspec.h"
 #include "object-name.h"

diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 1fba4cf559045cdf0915fd60f82b99b4b008fa59..324e904ac935dafa40ff3bb2042d4a8e863f9f99 100644 (file)
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "fmt-merge-msg.h"

diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index b118758713584ac3923285b50a21fc176570cc83..8085ebd8fe97b53f0a8705a414c40e82cb9699bb 100644 (file)
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "commit.h"
 #include "config.h"

diff --git a/builtin/for-each-repo.c b/builtin/for-each-repo.c
index 93d82b952e9f5d5c2c8d7577f6bf4e112450d569..fae7f91cf15f7e5b5964d59bbc0f19b4f08146fc 100644 (file)
--- a/builtin/for-each-repo.c
+++ b/builtin/for-each-repo.c
@@ -1,9 +1,9 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"
 #include "parse-options.h"
 #include "path.h"
-#include "repository.h"
 #include "run-command.h"
 #include "string-list.h"
 

diff --git a/builtin/fsck.c b/builtin/fsck.c
index 87068cee09d5a1ad90e1d36a6698644876daf040..7f4e2f0414327166043b90c0b4ace66dbbdf4da3 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -1,7 +1,7 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "gettext.h"
 #include "hex.h"
-#include "repository.h"
 #include "config.h"
 #include "commit.h"
 #include "tree.h"

diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c
index 73a4b8856610dfc66ea3c6c60eba9a8324a3b5dc..ba8a6eebe5d7380464eeef5f985b97f43260618d 100644 (file)
--- a/builtin/fsmonitor--daemon.c
+++ b/builtin/fsmonitor--daemon.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "config.h"
@@ -11,7 +12,7 @@
 #include "compat/fsmonitor/fsm-health.h"
 #include "compat/fsmonitor/fsm-listen.h"
 #include "fsmonitor--daemon.h"
-#include "repository.h"
+
 #include "simple-ipc.h"
 #include "khash.h"
 #include "run-command.h"

diff --git a/builtin/gc.c b/builtin/gc.c
index 0727de1ae8ef22171a42d16d8ced625c754d1e50..6bc8f7e7f81db7dc9af8b72cdd23c6920f74a4c8 100644 (file)
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -9,13 +9,12 @@
  *
  * Copyright (c) 2006 Shawn O. Pearce
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "date.h"
 #include "environment.h"
 #include "hex.h"
-#include "repository.h"
 #include "config.h"
 #include "tempfile.h"
 #include "lockfile.h"

diff --git a/builtin/get-tar-commit-id.c b/builtin/get-tar-commit-id.c
index 6bec0d1854c03ecbda0c364a7ff8313b10ca3069..272384a6b15d03d0f88de75e972d04acafd49043 100644 (file)
--- a/builtin/get-tar-commit-id.c
+++ b/builtin/get-tar-commit-id.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2005, 2006 Rene Scharfe
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "commit.h"
 #include "tar.h"

diff --git a/builtin/grep.c b/builtin/grep.c
index da11879c6378776225c6b3a6d4eaf8b55baee375..bc3439cabd5a5e3a0b9f29bdd62f4b4a65527799 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -3,11 +3,11 @@
  *
  * Copyright (c) 2006 Junio C Hamano
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "gettext.h"
 #include "hex.h"
-#include "repository.h"
 #include "config.h"
 #include "tag.h"
 #include "tree-walk.h"

diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index 090daea5cd8fdacad26f7c6b5156eecde4fc3199..a25f0403f444af8917c5971d2bf56100bf3a5126 100644 (file)
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -4,6 +4,7 @@
  * Copyright (C) Linus Torvalds, 2005
  * Copyright (C) Junio C Hamano, 2005
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "config.h"

diff --git a/builtin/help.c b/builtin/help.c
index f7723bdf5c866da66a39d895385fe28f2886409f..9c4cfe11d9e529abd2a60a3bdbdecb69bee92b49 100644 (file)
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -1,6 +1,8 @@
+
 /*
  * Builtin help command
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "exec-cmd.h"

diff --git a/builtin/hook.c b/builtin/hook.c
index f02e2421ac00ef243e8adc57bed257cbd0b7f830..367ef3e0b893fa16756880395151a82ed053acd8 100644 (file)
--- a/builtin/hook.c
+++ b/builtin/hook.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 3207130bfee454bb7ccda2cc09c35917b735fd48..32641134e93831e696dcf83d8dcc88b6e8b02392 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "delta.h"

diff --git a/builtin/init-db.c b/builtin/init-db.c
index 94bd6075095ec391164bb33516f64ac2992cec3a..687cada4d7e715183dd57b602c9e253ffd24615b 100644 (file)
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "environment.h"
@@ -11,7 +12,6 @@
 #include "parse-options.h"
 #include "path.h"
 #include "refs.h"
-#include "repository.h"
 #include "setup.h"
 #include "strbuf.h"
 

diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
index fb93e54e5ea613cdd85ce14a936f553687aa75ce..44f83625c11a1582eda27c5f03154a0c9c96d8e2 100644 (file)
--- a/builtin/interpret-trailers.c
+++ b/builtin/interpret-trailers.c
@@ -4,7 +4,7 @@
  * Copyright (c) 2013, 2014 Christian Couder <chriscool@tuxfamily.org>
  *
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "gettext.h"
 #include "parse-options.h"

diff --git a/builtin/log.c b/builtin/log.c
index 67140575f4b351c26dd74f44e1164e833ed2e9d9..e4533a99fda7510635258ddfdfd47b5fa39dff47 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -4,6 +4,7 @@
  * (C) Copyright 2006 Linus Torvalds
  *              2006 Junio Hamano
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "config.h"
@@ -37,7 +38,7 @@
 #include "mailmap.h"
 #include "progress.h"
 #include "commit-slab.h"
-#include "repository.h"
+
 #include "commit-reach.h"
 #include "range-diff.h"
 #include "tmp-objdir.h"

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 7f45cb62cf63d5c33e0a1b573391b75ae062cfbc..6aaba08e3058f48067a08e860b5f55f3a1a68162 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -5,8 +5,8 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
-#include "repository.h"
 #include "config.h"
 #include "convert.h"
 #include "quote.h"

diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index f2c2854d0c3ab940d2088ffc989c6e97a7cc52b9..f723b3bf3bb5d9b8b086a96231eb9a6bb9956d7c 100644 (file)
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "gettext.h"
 #include "hex.h"

diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index 363cb948d92dbd3880f1b4c0d603342eeecb8a7a..8542b5d53e435d0bec9878410a57cf013fceb25b 100644 (file)
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -3,7 +3,9 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
+
 #include "config.h"
 #include "gettext.h"
 #include "hex.h"

diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c
index 00bfcd1afa05adf3db40c26771dd1b8ec98c0e28..e17dec27b1df69c1e2a1020f245dd99c0973eaad 100644 (file)
--- a/builtin/mailinfo.c
+++ b/builtin/mailinfo.c
@@ -2,6 +2,7 @@
  * Another stupid program, this one parsing the headers of an
  * email to figure out authorship and subject
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "environment.h"

diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c
index b8f7150ce9a5b47bbb15a13f392bdd8698efe2a9..24254221417327c95a9c6ab1f9027d0bced70a7e 100644 (file)
--- a/builtin/mailsplit.c
+++ b/builtin/mailsplit.c
@@ -4,6 +4,7 @@
  * It just splits a mbox into a list of files: "0001" "0002" ..
  * so you can process them further from there.
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "gettext.h"
 #include "string-list.h"

diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index afeae8d8346c610b7e2231f751b74dfa1352811f..a20c93b11aaa0b9f380b843469da2a3b5db10d00 100644 (file)
--- a/builtin/merge-base.c
+++ b/builtin/merge-base.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "commit.h"
@@ -5,7 +6,6 @@
 #include "hex.h"
 #include "object-name.h"
 #include "parse-options.h"
-#include "repository.h"
 #include "commit-reach.h"
 
 static int show_merge_base(struct commit **rev, int rev_nr, int show_all)

diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index f785813ddae2f29b843a19ac152a378414fec5db..cb42865eb524bc9cd66f64fbe016c56df4869c87 100644 (file)
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "diff.h"

diff --git a/builtin/merge-index.c b/builtin/merge-index.c
index 1309a8ff4718295cbc4e5e9bb17dabb8e551200d..a5b87ee3c5e3dec5aefd195848f566b7cb4fc8f3 100644 (file)
--- a/builtin/merge-index.c
+++ b/builtin/merge-index.c
@@ -1,7 +1,7 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "hex.h"
 #include "read-cache-ll.h"
-#include "repository.h"
 #include "run-command.h"
 #include "sparse-index.h"
 

diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c
index 62267f12dd87e7ecb09355fa3747de190c6f71d7..1fcf53f0054e94e413aedd062189e3bc57079dcf 100644 (file)
--- a/builtin/merge-ours.c
+++ b/builtin/merge-ours.c
@@ -7,10 +7,11 @@
  *
  * Pretend we resolved the heads, but declare our tree trumps everybody else.
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "git-compat-util.h"
 #include "builtin.h"
 #include "diff.h"
-#include "repository.h"
+
 
 static const char builtin_merge_ours_usage[] =
        "git merge-ours <base>... -- HEAD <remote>...";

diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index 2bd3fb0e553db9541b65d584a6568c7eaa67e5d3..1dd295558b207d495eb0e4bf4523f7a78f9eb070 100644 (file)
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -1,10 +1,10 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "advice.h"
 #include "gettext.h"
 #include "hash.h"
 #include "merge-recursive.h"
 #include "object-name.h"
-#include "repository.h"
 
 static const char builtin_merge_recursive_usage[] =
        "git %s <base>... -- <head> <remote> ...";

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 8751d86fd0fd4acadabb6a1e77ff64b837408a44..33f91872f9eec9dcf008acdbf46952b040826e35 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "tree-walk.h"
 #include "xdiff-interface.h"
@@ -10,7 +11,6 @@
 #include "object-name.h"
 #include "object-store-ll.h"
 #include "parse-options.h"
-#include "repository.h"
 #include "blob.h"
 #include "merge-blobs.h"
 #include "quote.h"

diff --git a/builtin/merge.c b/builtin/merge.c
index fd6dc00d6c0d238fa5e2e053558a332e53b5bd34..c54ac7b67c6b0a48c7f72857960c2d7d04734f8b 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -5,8 +5,9 @@
  *
  * Based on git-merge.sh by Junio C Hamano.
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
+
 #include "abspath.h"
 #include "advice.h"
 #include "config.h"

diff --git a/builtin/mktag.c b/builtin/mktag.c
index 5cd8a3e6fa06a3f2df4fd8b7c3e896b19f639c57..6e188dce50a4f51bb1fb3dc72dd7236d79830f03 100644 (file)
--- a/builtin/mktag.c
+++ b/builtin/mktag.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "gettext.h"
 #include "hex.h"

diff --git a/builtin/mktree.c b/builtin/mktree.c
index 72a1af1bca5e4bf2327b1bebeae00aab4e0d5015..3c16faa40e38107662100a8565d179723bc2aeea 100644 (file)
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -3,6 +3,7 @@
  *
  * Copyright (c) Junio C Hamano, 2006, 2009
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "gettext.h"
 #include "hex.h"

diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c
index 154fc77075f11d8b3e61f3d1773bd93c6eac89e2..e397723fe091c70a38e7ae0bc4788dcce886bac9 100644 (file)
--- a/builtin/multi-pack-index.c
+++ b/builtin/multi-pack-index.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "config.h"

diff --git a/builtin/mv.c b/builtin/mv.c
index 6e2eb9cf4b80c2f4ed09ac66435e18ffdfa02609..472a27873767b80cb63d84f05903292d6dd661e1 100644 (file)
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2006 Johannes Schindelin
  */
+#define USE_THE_REPOSITORY_VARIABLE
 
 #include "builtin.h"
 #include "abspath.h"
@@ -18,7 +19,7 @@
 #include "string-list.h"
 #include "parse-options.h"
 #include "read-cache-ll.h"
-#include "repository.h"
+
 #include "setup.h"
 #include "strvec.h"
 #include "submodule.h"

diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index 19d92fb382d495ff45a976d6a4d8953ce0b2f8dc..7f08c38629c989b1638ac973c9d676032be02b00 100644 (file)
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -1,8 +1,8 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "environment.h"
 #include "gettext.h"
 #include "hex.h"
-#include "repository.h"
 #include "config.h"
 #include "commit.h"
 #include "tag.h"

diff --git a/builtin/notes.c b/builtin/notes.c
index 49d8364af6065eae342fdf326e95f157eb45fe96..55ce2eb919aafb863ac6fb8f2ae4e5d0d757d2ef 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -6,7 +6,7 @@
  * Based on git-notes.sh by Johannes Schindelin,
  * and builtin/tag.c by Kristian Høgsberg and Carlos Rica.
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "editor.h"
@@ -17,7 +17,7 @@
 #include "object-name.h"
 #include "object-store-ll.h"
 #include "path.h"
-#include "repository.h"
+
 #include "pretty.h"
 #include "refs.h"
 #include "exec-cmd.h"

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 127972f3cdfdbfffb66f25075eb0c4a8a2894414..40c64f3377922c802c67bbed0ae9fcd83f9896d6 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -1,8 +1,8 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "environment.h"
 #include "gettext.h"
 #include "hex.h"
-#include "repository.h"
 #include "config.h"
 #include "attr.h"
 #include "object.h"

diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c
index 84f0d83affb1ea251f3fd02995a1e4276b21b3ca..81f4494d466adef4d6a38874cb6576c644ad9358 100644 (file)
--- a/builtin/pack-redundant.c
+++ b/builtin/pack-redundant.c
@@ -5,11 +5,12 @@
 * This file is licensed under the GPL v2.
 *
 */
+#define USE_THE_REPOSITORY_VARIABLE
 
 #include "builtin.h"
 #include "gettext.h"
 #include "hex.h"
-#include "repository.h"
+
 #include "packfile.h"
 #include "object-store-ll.h"
 

diff --git a/builtin/pack-refs.c b/builtin/pack-refs.c
index 67dabb397568b23e6b2267b65352e7e62df6d021..2d83c1ed2ac8c7fcf5568e46f56ae308447cfadf 100644 (file)
--- a/builtin/pack-refs.c
+++ b/builtin/pack-refs.c
@@ -1,9 +1,9 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"
 #include "parse-options.h"
 #include "refs.h"
-#include "repository.h"
 #include "revision.h"
 
 static char const * const pack_refs_usage[] = {

diff --git a/builtin/patch-id.c b/builtin/patch-id.c
index fa31a1b7a605b9bf11fff07c84230c3ce442ab2f..704044c2eb950c08b74ed692ffa4fbfd187989eb 100644 (file)
--- a/builtin/patch-id.c
+++ b/builtin/patch-id.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "diff.h"

diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c
index 4d63f26b0a120caf54ec8ca404be7c0d3d877a8d..0720d825c83da923a9b75a8c3b284ed7752505f6 100644 (file)
--- a/builtin/prune-packed.c
+++ b/builtin/prune-packed.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "gettext.h"
 #include "parse-options.h"

diff --git a/builtin/prune.c b/builtin/prune.c
index cbd4c38fa0ac50313dfe9ae1eca4d8b8fd68a0fe..f439d1b5bb9918c8e073c3f5a86c0bf184034a27 100644 (file)
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "commit.h"
 #include "diff.h"

diff --git a/builtin/pull.c b/builtin/pull.c
index 1a926f0b0d74903571c062a9e861f1f1af19280e..149f201320549ffdc6fa21d61027540b6a02c690 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -6,6 +6,7 @@
  * Fetch one or more remote refs and merge it/them into the current HEAD.
  */
 
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "advice.h"
 #include "config.h"

diff --git a/builtin/push.c b/builtin/push.c
index 9636ad52f4d685a8397f534e49a53529a8ee806f..238cd5da829d230683c25e93dc660c9f123653fa 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -1,6 +1,7 @@
 /*
  * "git push"
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "advice.h"
 #include "branch.h"
@@ -13,7 +14,6 @@
 #include "transport.h"
 #include "parse-options.h"
 #include "pkt-line.h"
-#include "repository.h"
 #include "submodule.h"
 #include "submodule-config.h"
 #include "send-pack.h"

diff --git a/builtin/range-diff.c b/builtin/range-diff.c
index 3e67259aecc1e44722b858845c0af9bfac0e4133..1b33ab66a7b2013224f1c8f29854433d76776a0e 100644 (file)
--- a/builtin/range-diff.c
+++ b/builtin/range-diff.c
@@ -1,10 +1,11 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "gettext.h"
 #include "object-name.h"
 #include "parse-options.h"
 #include "range-diff.h"
 #include "config.h"
-#include "repository.h"
+
 
 static const char * const builtin_range_diff_usage[] = {
 N_("git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"),

diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 89410db6a7aac02227e0367fa24d850a51416dde..d2a807a828b6aba726d325ec49cf01f8e84858d7 100644 (file)
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"
@@ -16,7 +16,6 @@
 #include "cache-tree.h"
 #include "unpack-trees.h"
 #include "parse-options.h"
-#include "repository.h"
 #include "resolve-undo.h"
 #include "setup.h"
 #include "sparse-index.h"

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 727d9df847f30de9ff7bb4bd27d05c29bc49bbb4..d2ad7d08631bbe1197754b5ef275c9d3f78ea330 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -3,8 +3,9 @@
  *
  * Copyright (c) 2018 Pratik Karki
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
+
 #include "abspath.h"
 #include "environment.h"
 #include "gettext.h"

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 36a6229c2a4f35e5eac8e31e97526c7e654ce3c0..c4b766c61377c9d20186e378e6bf8fd3698e65ad 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -1,6 +1,7 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
-#include "repository.h"
+
 #include "config.h"
 #include "environment.h"
 #include "gettext.h"

diff --git a/builtin/reflog.c b/builtin/reflog.c
index 6250f5ad49fe7c59100b99b46b16439d37e4f0b8..22df6834f71098ab8378e4423967f0fb87858340 100644 (file)
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -1,7 +1,7 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"
-#include "repository.h"
 #include "revision.h"
 #include "reachable.h"
 #include "wildmatch.h"

diff --git a/builtin/refs.c b/builtin/refs.c
index 70bca724d2a5442cd8efb8b78d2b2dc4c15a6e30..24978a7b7b081ac6ed8ca99016f201d34c0639f8 100644 (file)
--- a/builtin/refs.c
+++ b/builtin/refs.c
@@ -1,9 +1,9 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "fsck.h"
 #include "parse-options.h"
 #include "refs.h"
-#include "repository.h"
 #include "strbuf.h"
 
 #define REFS_MIGRATE_USAGE \

diff --git a/builtin/remote-ext.c b/builtin/remote-ext.c
index 33c8ae0fc7d638461e11b01b1c31d291efdacba9..119f33895e776e3f012af4dd116d1069bc3b7b4c 100644 (file)
--- a/builtin/remote-ext.c
+++ b/builtin/remote-ext.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "transport.h"
 #include "run-command.h"

diff --git a/builtin/remote-fd.c b/builtin/remote-fd.c
index ae896eda57b86d110d6cb2f3aec1cc8e69ddb508..b27ea81e4fb30e8424c67681c49ae44e799b0cb8 100644 (file)
--- a/builtin/remote-fd.c
+++ b/builtin/remote-fd.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "transport.h"
 

diff --git a/builtin/remote.c b/builtin/remote.c
index 1ac7e5fbce393aba0778d86fcb076d074233384f..61a82e515b95d395e933d7edf031e6d7887f4c99 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/builtin/repack.c b/builtin/repack.c
index a6f2a4de1b8c4c8cae7593d6a82c6306edcab250..1e2286d93a1aac7901ab015ba954794d53a08d73 100644 (file)
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "dir.h"

diff --git a/builtin/replace.c b/builtin/replace.c
index 293ae6d327f8ec4eec2badf03a40590cbfddafcd..2daed943735149e2a520486e2a7de1b3a4c2b4a6 100644 (file)
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -7,7 +7,7 @@
  * and Carlos Rica <jasampler@gmail.com> that was itself based on
  * git-tag.sh and mktag.c by Linus Torvalds.
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "editor.h"
@@ -22,7 +22,6 @@
 #include "object-name.h"
 #include "object-store-ll.h"
 #include "replace-object.h"
-#include "repository.h"
 #include "tag.h"
 #include "wildmatch.h"
 

diff --git a/builtin/replay.c b/builtin/replay.c
index c8e9098fc1208de632cb33c6bcdd32824f5fb58c..2d12a4e403fa7d4499de0911191b545e31a1e95f 100644 (file)
--- a/builtin/replay.c
+++ b/builtin/replay.c
@@ -4,6 +4,7 @@
 
 #include "git-compat-util.h"
 
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "environment.h"
 #include "hex.h"

diff --git a/builtin/rerere.c b/builtin/rerere.c
index ae345155834ce4df5ee1bd1f7dee8aa9e10ea14e..f7143c3f5d5670c83ff9995e756cd12ea7626863 100644 (file)
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -1,8 +1,9 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"
 #include "parse-options.h"
-#include "repository.h"
+
 #include "string-list.h"
 #include "rerere.h"
 #include "xdiff/xdiff.h"

diff --git a/builtin/reset.c b/builtin/reset.c
index 75529072606f6c25df9dc1c3b322d5934bec755c..cb054c2cc0e2e66094b58acc94fa54b1c74900ff 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 2005, 2006 Linus Torvalds and Junio C Hamano
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "advice.h"
 #include "config.h"

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index a4186d47ce347281d02584db4492d1d3aa0e1e8e..f62bcbf2b140d1be87e0d03876e5ff94b17d7944 100644 (file)
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "commit.h"

diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 26190aaa3eda1ea3850d46fa23f7496234952d93..f2d90f699522645d74356e02537dd7e15b393806 100644 (file)
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -3,8 +3,9 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
+
 #include "abspath.h"
 #include "config.h"
 #include "commit.h"

diff --git a/builtin/revert.c b/builtin/revert.c
index 5f2ec3ade73cf3593d18f57a543608a23a91fe2d..55ba1092c52f420191bdafb20c93708eaee1f69b 100644 (file)
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -1,9 +1,9 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "git-compat-util.h"
 #include "builtin.h"
 #include "parse-options.h"
 #include "diff.h"
 #include "gettext.h"
-#include "repository.h"
 #include "revision.h"
 #include "rerere.h"
 #include "sequencer.h"

diff --git a/builtin/rm.c b/builtin/rm.c
index 59077efa4b495db0bc0934bd2231f1866085cfb3..eaff027258db4d7e7d1ca73f914d4bf756aa691d 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) Linus Torvalds 2006
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "advice.h"
 #include "config.h"
@@ -15,7 +15,7 @@
 #include "object-name.h"
 #include "parse-options.h"
 #include "read-cache.h"
-#include "repository.h"
+
 #include "string-list.h"
 #include "setup.h"
 #include "sparse-index.h"

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index a4925ed5fd127bd62a4ba29ee7cca8c4ce126727..4fd3cb8a357b01ee39f6aad763e8cbb9aab65c85 100644 (file)
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "hex.h"

diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 70eb789033450c4a1e89c2ebf5b9bd4d06c5635f..3ed5c460786dfcb8d4e4edc899d57e870cd1a178 100644 (file)
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "commit.h"
@@ -5,7 +6,6 @@
 #include "environment.h"
 #include "gettext.h"
 #include "string-list.h"
-#include "repository.h"
 #include "revision.h"
 #include "utf8.h"
 #include "mailmap.h"

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 05c10628df949687e243b6c9eca301080d616dab..cd6bdf63bc103de7a4bffe61416e720f80cf3482 100644 (file)
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "environment.h"
@@ -10,7 +11,7 @@
 #include "strvec.h"
 #include "object-name.h"
 #include "parse-options.h"
-#include "repository.h"
+
 #include "dir.h"
 #include "commit-slab.h"
 #include "date.h"

diff --git a/builtin/show-index.c b/builtin/show-index.c
index 9e1f7ac9ca5582701e16d5498073eff9fd1ca06f..f164c01bbea4003ee97cdc4b3f7131b5b7def9ad 100644 (file)
--- a/builtin/show-index.c
+++ b/builtin/show-index.c
@@ -1,10 +1,10 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "gettext.h"
 #include "hash.h"
 #include "hex.h"
 #include "pack.h"
 #include "parse-options.h"
-#include "repository.h"
 
 static const char *const show_index_usage[] = {
        "git show-index [--object-format=<hash-algorithm>]",

diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 6ee05f09a694dcca2292a40bf2efa39c5246e056..285cd3e43382cb94a5c40ef7f44715ecfc5f4adf 100644 (file)
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
index 23f1548fe54ab177fee4ca454bc1ee129ddccade..5e930e5d6390fcb18306409056a34780762c9a54 100644 (file)
--- a/builtin/sparse-checkout.c
+++ b/builtin/sparse-checkout.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "dir.h"
@@ -7,7 +8,6 @@
 #include "object-name.h"
 #include "parse-options.h"
 #include "pathspec.h"
-#include "repository.h"
 #include "strbuf.h"
 #include "string-list.h"
 #include "lockfile.h"

diff --git a/builtin/stash.c b/builtin/stash.c
index 518d297b47b3d76f05a210f2780e4be185639b9c..461cfaef39acd853a7f6ab1061024e7d8061b2a5 100644 (file)
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "config.h"

diff --git a/builtin/stripspace.c b/builtin/stripspace.c
index 674ef9397697f701f58e7497b3192d07e508d243..e147f3ff92c37afe79a26808b5dfd83476fc3366 100644 (file)
--- a/builtin/stripspace.c
+++ b/builtin/stripspace.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "environment.h"

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 947bd9d0f6a79e909e49dc5f1528adc7f18fe585..b83d44ba6dcaf52930a2701f1aeb3f4cb0477e9e 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -1,9 +1,10 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "environment.h"
 #include "gettext.h"
 #include "hex.h"
-#include "repository.h"
+
 #include "config.h"
 #include "parse-options.h"
 #include "quote.h"

diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c
index 9bc702294684983e5c6a7e6396989f0c864286b9..299d23d76a83f3962bd00e7f8d515bb8438bff3d 100644 (file)
--- a/builtin/symbolic-ref.c
+++ b/builtin/symbolic-ref.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/builtin/tag.c b/builtin/tag.c
index a80838eb8e0ddf14532899a610d7316e40c1dab6..ca2166e7e21f0914f42cdcf93dc027e9bf3934d1 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -5,7 +5,7 @@
  *                    Carlos Rica <jasampler@gmail.com>
  * Based on git-tag.sh and mktag.c by Linus Torvalds.
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "advice.h"
 #include "config.h"

diff --git a/builtin/unpack-file.c b/builtin/unpack-file.c
index 97886840f8d111d33e90b35766a919857919c745..6da282575391b94c4b2a908eee3223a81d4a9ff1 100644 (file)
--- a/builtin/unpack-file.c
+++ b/builtin/unpack-file.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "hex.h"

diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 3bcdaaeb5fa6322e5cf389e9aae03225708299fc..02b8d02f63f0a216b52de38cb47e010c7bfccb07 100644 (file)
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "bulk-checkin.h"
 #include "config.h"

diff --git a/builtin/update-index.c b/builtin/update-index.c
index 1d1d87d08e3431773fb9f038c7cac172a20a8ee6..a1a98aa7bcada582a656b516cf48266a13df1748 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "bulk-checkin.h"
 #include "config.h"
@@ -22,7 +22,6 @@
 #include "pathspec.h"
 #include "dir.h"
 #include "read-cache.h"
-#include "repository.h"
 #include "setup.h"
 #include "sparse-index.h"
 #include "split-index.h"

diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index 06826a90515e51fbcf90b423c4a5f7435c508f11..8a98615dc8613a1be3b17c6d688ab9c0208ed003 100644 (file)
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"
@@ -6,7 +7,6 @@
 #include "object-name.h"
 #include "parse-options.h"
 #include "quote.h"
-#include "repository.h"
 
 static const char * const git_update_ref_usage[] = {
        N_("git update-ref [<options>] -d <refname> [<old-oid>]"),

diff --git a/builtin/update-server-info.c b/builtin/update-server-info.c
index a5b7d86727caa247126a19e046f526b7ab1e0abb..6769611a025d0d69bcd3dbbd06f5fed056262911 100644 (file)
--- a/builtin/update-server-info.c
+++ b/builtin/update-server-info.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c
index 49d1bb7fb441cdc9d5e7405d143ecf0541f3df3c..6f2ddbd71c8ad34466eb9de23eaf40a7caf49e3a 100644 (file)
--- a/builtin/upload-archive.c
+++ b/builtin/upload-archive.c
@@ -1,12 +1,12 @@
 /*
  * Copyright (c) 2006 Franck Bui-Huu
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "archive.h"
 #include "path.h"
 #include "pkt-line.h"
 #include "sideband.h"
-#include "repository.h"
 #include "run-command.h"
 #include "strvec.h"
 

diff --git a/builtin/upload-pack.c b/builtin/upload-pack.c
index 3b6c83fbce3684f627e2e86818671e9c0dab30e1..363091c31e8f31f49fd250f2b1c56cdfede824ab 100644 (file)
--- a/builtin/upload-pack.c
+++ b/builtin/upload-pack.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "exec-cmd.h"
 #include "gettext.h"

diff --git a/builtin/var.c b/builtin/var.c
index 4a5c2649d6ff825d1cd4595453aa5e076f1eff7f..2ecaed51b441963ddbfb6983403bd364d4fd72fd 100644 (file)
--- a/builtin/var.c
+++ b/builtin/var.c
@@ -3,7 +3,9 @@
  *
  * Copyright (C) Eric Biederman, 2005
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
+
 #include "attr.h"
 #include "config.h"
 #include "editor.h"

diff --git a/builtin/verify-commit.c b/builtin/verify-commit.c
index c5859e5b2b45360b0e51a0ecef51d610ec4ed206..779b7988ca97847c087d4ec697616d4506cb71d2 100644 (file)
--- a/builtin/verify-commit.c
+++ b/builtin/verify-commit.c
@@ -5,11 +5,11 @@
  *
  * Based on git-verify-tag
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"
 #include "object-name.h"
-#include "repository.h"
 #include "commit.h"
 #include "parse-options.h"
 #include "gpg-interface.h"

diff --git a/builtin/verify-pack.c b/builtin/verify-pack.c
index 7ad456649d2c5654a242f561dbc4245e1f31abde..34e4ed715f3e8e1eba31bb88b048b274b7ac1703 100644 (file)
--- a/builtin/verify-pack.c
+++ b/builtin/verify-pack.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index a7bef52419134838386d0296bfa45b8a4becbf30..f6b97048a57d37b6cd116385fe4a38b04b48344c 100644 (file)
--- a/builtin/verify-tag.c
+++ b/builtin/verify-tag.c
@@ -5,6 +5,7 @@
  *
  * Based on git-verify-tag.sh
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 3b47f9832fa39aafedcb1588d1cd8aaa3167a5f0..c22b2e95f50db7710948262f7e9539efa0481220 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -1,3 +1,4 @@
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "advice.h"
@@ -17,7 +18,6 @@
 #include "read-cache-ll.h"
 #include "refs.h"
 #include "remote.h"
-#include "repository.h"
 #include "run-command.h"
 #include "hook.h"
 #include "sigchain.h"

diff --git a/builtin/write-tree.c b/builtin/write-tree.c
index 1b467d6ed231edc17decf6241246ba52d6ec057b..de4ebf767d47449f9906dae932d07fd21616e9c4 100644 (file)
--- a/builtin/write-tree.c
+++ b/builtin/write-tree.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
-
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "environment.h"
@@ -12,7 +12,6 @@
 #include "tree.h"
 #include "cache-tree.h"
 #include "parse-options.h"
-#include "repository.h"
 
 static const char * const write_tree_usage[] = {
        N_("git write-tree [--missing-ok] [--prefix=<prefix>/]"),