abspath.h: move absolute path functions from cache.h

This is another step towards letting us remove the include of cache.h in
strbuf.c.  It does mean that we also need to add includes of abspath.h
in a number of C files.

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

diff --git a/abspath.c b/abspath.c
index 9a81c5525bea667ecaba3909f195f40bb4e69d7d..d032f5dce517cbeb11ce703c5d9709bc35c8435b 100644 (file)
--- a/abspath.c
+++ b/abspath.c
@@ -1,4 +1,6 @@
-#include "cache.h"
+#include "git-compat-util.h"
+#include "abspath.h"
+#include "strbuf.h"
 
 /*
  * Do not use this for inspecting *tracked* content.  When path is a

diff --git a/abspath.h b/abspath.h
new file mode 100644 (file)
index 0000000..7cd3de5
--- /dev/null
+++ b/abspath.h
@@ -0,0 +1,33 @@
+#ifndef ABSPATH_H
+#define ABSPATH_H
+
+int is_directory(const char *);
+char *strbuf_realpath(struct strbuf *resolved, const char *path,
+                     int die_on_error);
+char *strbuf_realpath_forgiving(struct strbuf *resolved, const char *path,
+                               int die_on_error);
+char *real_pathdup(const char *path, int die_on_error);
+const char *absolute_path(const char *path);
+char *absolute_pathdup(const char *path);
+
+/*
+ * Concatenate "prefix" (if len is non-zero) and "path", with no
+ * connecting characters (so "prefix" should end with a "/").
+ * Unlike prefix_path, this should be used if the named file does
+ * not have to interact with index entry; i.e. name of a random file
+ * on the filesystem.
+ *
+ * The return value is always a newly allocated string (even if the
+ * prefix was empty).
+ */
+char *prefix_filename(const char *prefix, const char *path);
+
+/* Likewise, but path=="-" always yields "-" */
+char *prefix_filename_except_for_dash(const char *prefix, const char *path);
+
+static inline int is_absolute_path(const char *path)
+{
+       return is_dir_sep(path[0]) || has_dos_drive_prefix(path);
+}
+
+#endif /* ABSPATH_H */

diff --git a/apply.c b/apply.c
index e0bdd43a68e01a527efb1a250493241fc76f6970..e5e11b85793e3b29d2947f352e38fe6983d76baf 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -8,6 +8,7 @@
  */
 
 #include "cache.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "config.h"
 #include "object-store.h"

diff --git a/archive.c b/archive.c
index 2c3da1cff306924a93ac354a835321e123b72785..c3c45a5ebe9f8f73d53baaca3d05099697aac9cc 100644 (file)
--- a/archive.c
+++ b/archive.c
@@ -1,4 +1,5 @@
 #include "git-compat-util.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/builtin/am.c b/builtin/am.c
index cc1fdf4f75d452c9cf34af0c3c476bc1be9bc607..14347ecf9aa3dc22f6bee283db7f0782ccf11b04 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -5,6 +5,7 @@
  */
 #define USE_THE_INDEX_VARIABLE
 #include "cache.h"
+#include "abspath.h"
 #include "config.h"
 #include "builtin.h"
 #include "exec-cmd.h"

diff --git a/builtin/bugreport.c b/builtin/bugreport.c
index b61cfa9464f8ea4f7009866fab763b84f0228b5a..b5dfad4e12a6d3d5e94e971a3dc226739ea9cf22 100644 (file)
--- a/builtin/bugreport.c
+++ b/builtin/bugreport.c
@@ -1,4 +1,5 @@
 #include "builtin.h"
+#include "abspath.h"
 #include "gettext.h"
 #include "parse-options.h"
 #include "strbuf.h"

diff --git a/builtin/bundle.c b/builtin/bundle.c
index de3898ffa416b89a211a341edf47b19463b8c5fe..9e2aecadf7d51d07a88e25cc47a4d539ee7b62f3 100644 (file)
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@@ -1,4 +1,5 @@
 #include "builtin.h"
+#include "abspath.h"
 #include "gettext.h"
 #include "strvec.h"
 #include "parse-options.h"

diff --git a/builtin/clean.c b/builtin/clean.c
index 46c51029ab4cf59b1652147f44a0c790b28f3ff2..fdcf62c5dfe6aa2102c4380fa6c753dffa7004a6 100644 (file)
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -8,6 +8,7 @@
 
 #define USE_THE_INDEX_VARIABLE
 #include "builtin.h"
+#include "abspath.h"
 #include "cache.h"
 #include "config.h"
 #include "dir.h"

diff --git a/builtin/clone.c b/builtin/clone.c
index d605fcafa0fd82ef591a95a74aa202ad308396d9..b94324ea02c3b2c8f53840e4b191983c21fc7356 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -10,6 +10,7 @@
 
 #define USE_THE_INDEX_VARIABLE
 #include "builtin.h"
+#include "abspath.h"
 #include "config.h"
 #include "gettext.h"
 #include "hex.h"

diff --git a/builtin/config.c b/builtin/config.c
index 33b17b40b416d50e5b4156d809af0963286dcb4f..42e6b8d34814a4cb214d3be5c79fc2564098c60b 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -1,4 +1,5 @@
 #include "builtin.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "config.h"
 #include "color.h"

diff --git a/builtin/credential-cache--daemon.c b/builtin/credential-cache--daemon.c
index 0f00ba4d741f6adaa5d5f2e9ad1931e0975a4098..62c09a271d6eb4578ef0360910575c5611f61ffd 100644 (file)
--- a/builtin/credential-cache--daemon.c
+++ b/builtin/credential-cache--daemon.c
@@ -1,4 +1,5 @@
 #include "builtin.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "gettext.h"
 #include "parse-options.h"

diff --git a/builtin/diagnose.c b/builtin/diagnose.c
index 5b12d1fb963607656cf4941df8fc98bf7b5c3a78..0f8b64994c427a241e3d66726775d86a37c51f10 100644 (file)
--- a/builtin/diagnose.c
+++ b/builtin/diagnose.c
@@ -1,4 +1,5 @@
 #include "builtin.h"
+#include "abspath.h"
 #include "gettext.h"
 #include "parse-options.h"
 #include "diagnose.h"

diff --git a/builtin/difftool.c b/builtin/difftool.c
index f7380dd1cc7526b6f5e5a0f686f7170c64b718bf..ed06db120851aeef37440b6a8fb36666bd5cd610 100644 (file)
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -13,6 +13,7 @@
  */
 #define USE_THE_INDEX_VARIABLE
 #include "cache.h"
+#include "abspath.h"
 #include "config.h"
 #include "builtin.h"
 #include "run-command.h"

diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index f3635c7aefd945c8161b8d19d37df1401a5e5d85..7307c4657f22591080979bb6e39aa1d09590baca 100644 (file)
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -1,4 +1,5 @@
 #include "builtin.h"
+#include "abspath.h"
 #include "cache.h"
 #include "gettext.h"
 #include "hex.h"

diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c
index 215e3813d7de11e3640aca435fe4abd51c9d9284..4efb1417344e998d7e278d1ded8df89e044b5dbd 100644 (file)
--- a/builtin/fsmonitor--daemon.c
+++ b/builtin/fsmonitor--daemon.c
@@ -1,4 +1,5 @@
 #include "builtin.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/builtin/gc.c b/builtin/gc.c
index 32cabad7cf6181713bde95c7202f5dc6b87ff7b1..ef063fc828c82fe032f27dd241e5e492335d76ab 100644 (file)
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -11,6 +11,7 @@
  */
 
 #include "builtin.h"
+#include "abspath.h"
 #include "hex.h"
 #include "repository.h"
 #include "config.h"

diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index f233eda7590356d396dda93ce99eae6829323f0d..7651a7a5f56dfe4f81a63be6cb2559738c384bb2 100644 (file)
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -5,6 +5,7 @@
  * Copyright (C) Junio C Hamano, 2005
  */
 #include "builtin.h"
+#include "abspath.h"
 #include "config.h"
 #include "gettext.h"
 #include "hex.h"

diff --git a/builtin/init-db.c b/builtin/init-db.c
index e182bc7e8393340a803e0803addcc280db330b93..6f724f694f41c4d2109266bc19999e64d234fe3d 100644 (file)
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -4,6 +4,7 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 #include "cache.h"
+#include "abspath.h"
 #include "config.h"
 #include "gettext.h"
 #include "refs.h"

diff --git a/builtin/log.c b/builtin/log.c
index e702cf126e5de842b6715c9980f6745f992d9867..b7333b34cce1edcac4a2613d51f301649dc572a0 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -5,6 +5,7 @@
  *              2006 Junio Hamano
  */
 #include "git-compat-util.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c
index e8bb011cfb4af45a695bf0e558377f8f81c983ee..e14f7c0abce7e6e43603983f534cdea3af438440 100644 (file)
--- a/builtin/mailinfo.c
+++ b/builtin/mailinfo.c
@@ -3,6 +3,7 @@
  * email to figure out authorship and subject
  */
 #include "cache.h"
+#include "abspath.h"
 #include "builtin.h"
 #include "gettext.h"
 #include "utf8.h"

diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index ae45f523b951bcae8c94e71465e2e9a91c07c429..c0096ee0810961400346608cebfb77ab798eb06f 100644 (file)
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -1,4 +1,5 @@
 #include "builtin.h"
+#include "abspath.h"
 #include "cache.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/builtin/merge.c b/builtin/merge.c
index 2c9da4b23d1a667b8fa7bb52a187ecb65f9b5397..38243e55c5fac6d2823f41af323bd357a59ace24 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -8,6 +8,7 @@
 
 #define USE_THE_INDEX_VARIABLE
 #include "cache.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "config.h"
 #include "environment.h"

diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c
index e6757a44470bd62a9c721f01bae953a2afa6201f..579bc2cac0cc6789d179633a8befc9f823172373 100644 (file)
--- a/builtin/multi-pack-index.c
+++ b/builtin/multi-pack-index.c
@@ -1,4 +1,5 @@
 #include "builtin.h"
+#include "abspath.h"
 #include "cache.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/builtin/mv.c b/builtin/mv.c
index c02dddb72b545efb7cf8405fcd1ed02bd3f9136d..0a49bf21b0fbffc1af16dd051a73d2004d825058 100644 (file)
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -5,6 +5,7 @@
  */
 #define USE_THE_INDEX_VARIABLE
 #include "builtin.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "config.h"
 #include "gettext.h"

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

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 006565f85134706a915042efa2f2b59ccf277f0a..aec5ee930b235c1c22f5ca43ac00b772ea00496c 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -1,4 +1,5 @@
 #include "builtin.h"
+#include "abspath.h"
 #include "repository.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 5a932a861b4935be053cc067245379baf961338d..a4c0878bc916cab0d539f8497c3650c8be728e1e 100644 (file)
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -5,6 +5,7 @@
  */
 #define USE_THE_INDEX_VARIABLE
 #include "cache.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "config.h"
 #include "commit.h"

diff --git a/builtin/stash.c b/builtin/stash.c
index 65817d0b763ff310d87c33d3762157b760c35779..52fa892f7eb45750788d299a10448c5e9ee3920d 100644 (file)
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -1,5 +1,6 @@
 #define USE_THE_INDEX_VARIABLE
 #include "builtin.h"
+#include "abspath.h"
 #include "config.h"
 #include "gettext.h"
 #include "hex.h"

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index a4bdd44daa3c625e69fa4d46687fd37d8de4e025..ff1fd8c87abcbd8f4e86c3205652e33759797bb5 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -1,5 +1,6 @@
 #define USE_THE_INDEX_VARIABLE
 #include "builtin.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "gettext.h"
 #include "hex.h"

diff --git a/builtin/worktree.c b/builtin/worktree.c
index ed89b7e9725308b89f9beb2faf45526d42907f3c..ed614ffddcb87ae8fa2b363b70b00f1b83fd7c6d 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "abspath.h"
 #include "checkout.h"
 #include "config.h"
 #include "builtin.h"

diff --git a/cache.h b/cache.h
index e122de6f930f9ce0cb7e2e93c292a3b1662b30a3..260203c7a620c6b3256f55babd7f872b9b96f938 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -598,21 +598,6 @@ const char *setup_git_directory(void);
 char *prefix_path(const char *prefix, int len, const char *path);
 char *prefix_path_gently(const char *prefix, int len, int *remaining, const char *path);
 
-/*
- * Concatenate "prefix" (if len is non-zero) and "path", with no
- * connecting characters (so "prefix" should end with a "/").
- * Unlike prefix_path, this should be used if the named file does
- * not have to interact with index entry; i.e. name of a random file
- * on the filesystem.
- *
- * The return value is always a newly allocated string (even if the
- * prefix was empty).
- */
-char *prefix_filename(const char *prefix, const char *path);
-
-/* Likewise, but path=="-" always yields "-" */
-char *prefix_filename_except_for_dash(const char *prefix, const char *path);
-
 int check_filename(const char *prefix, const char *name);
 void verify_filename(const char *prefix,
                     const char *name,
@@ -1160,18 +1145,6 @@ char *interpolate_path(const char *path, int real_home);
 /* NEEDSWORK: remove this synonym once in-flight topics have migrated */
 #define expand_user_path interpolate_path
 const char *enter_repo(const char *path, int strict);
-static inline int is_absolute_path(const char *path)
-{
-       return is_dir_sep(path[0]) || has_dos_drive_prefix(path);
-}
-int is_directory(const char *);
-char *strbuf_realpath(struct strbuf *resolved, const char *path,
-                     int die_on_error);
-char *strbuf_realpath_forgiving(struct strbuf *resolved, const char *path,
-                               int die_on_error);
-char *real_pathdup(const char *path, int die_on_error);
-const char *absolute_path(const char *path);
-char *absolute_pathdup(const char *path);
 const char *remove_leading_path(const char *in, const char *prefix);
 const char *relative_path(const char *in, const char *prefix, struct strbuf *sb);
 int normalize_path_copy_len(char *dst, const char *src, int *prefix_len);

diff --git a/chdir-notify.c b/chdir-notify.c
index 5f7f2c2ac236f7aab50f0bbdc46324fd56213be9..929ec01b3a24435f56380f9497064ecc405c375f 100644 (file)
--- a/chdir-notify.c
+++ b/chdir-notify.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "abspath.h"
 #include "chdir-notify.h"
 #include "list.h"
 #include "strbuf.h"

diff --git a/compat/disk.h b/compat/disk.h
index a04a8d294af929acf39f44617573e61362e09fe7..6c979c27d89ec858b849f87e64505c2554cb121b 100644 (file)
--- a/compat/disk.h
+++ b/compat/disk.h
@@ -2,6 +2,7 @@
 #define COMPAT_DISK_H
 
 #include "git-compat-util.h"
+#include "abspath.h"
 #include "gettext.h"
 
 static int get_disk_info(struct strbuf *out)

diff --git a/compat/mingw.c b/compat/mingw.c
index a9e5570288c1023bfd8bbd5f8c8d47607402228e..cbcd03aea9b1d2260f04bbcf6a3db16cdaec7a3a 100644 (file)
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -7,6 +7,7 @@
 #include "../strbuf.h"
 #include "../run-command.h"
 #include "../cache.h"
+#include "../abspath.h"
 #include "../alloc.h"
 #include "win32/lazyload.h"
 #include "../config.h"

diff --git a/compat/simple-ipc/ipc-win32.c b/compat/simple-ipc/ipc-win32.c
index f011e5cead8ca6aeef2ef0eca5bd53f32e205eaa..997f6144344d883584b2991f2684ff383a7c9e55 100644 (file)
--- a/compat/simple-ipc/ipc-win32.c
+++ b/compat/simple-ipc/ipc-win32.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "abspath.h"
 #include "gettext.h"
 #include "simple-ipc.h"
 #include "strbuf.h"

diff --git a/config.c b/config.c
index f30a6d8e686c051aae16c9f9fb05a95e4833ac23..6815919ec303c060260ffde8ee828b45c6a2667f 100644 (file)
--- a/config.c
+++ b/config.c
@@ -6,6 +6,7 @@
  *
  */
 #include "cache.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "date.h"
 #include "branch.h"

diff --git a/credential.c b/credential.c
index 5244f3c12c075bea8417496ee63687277a684529..e6417bf88046e3afc28bc66460efc626e523ffd2 100644 (file)
--- a/credential.c
+++ b/credential.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "abspath.h"
 #include "config.h"
 #include "credential.h"
 #include "gettext.h"

diff --git a/daemon.c b/daemon.c
index 8908e7f8d2a27c4e81225f69c4a4401e0698c363..bb795ca3ca9726c61fb75b7a275bb8c442cfc371 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "config.h"
 #include "pkt-line.h"

diff --git a/diff-no-index.c b/diff-no-index.c
index 287a113baddcebe720ac6c98e3d446025f45eaf5..934a24bee5851ac0d3da1492d3deba6189402faf 100644 (file)
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -5,6 +5,7 @@
  */
 
 #include "cache.h"
+#include "abspath.h"
 #include "color.h"
 #include "commit.h"
 #include "blob.h"

diff --git a/diff.c b/diff.c
index 00746f2f86e2bd601cf08ba6a06e883fb31ae5e2..1b0be99c065e3f185c141ab63390bd5c8164e736 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2,6 +2,7 @@
  * Copyright (C) 2005 Junio C Hamano
  */
 #include "cache.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/dir.c b/dir.c
index 46f1bb6e5b7dee6721981adf8cc7c0a0b9aceb64..c72481c60ee3a552d46644443b3e1c66dc980d09 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -6,6 +6,7 @@
  *              Junio Hamano, 2005-2006
  */
 #include "git-compat-util.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "config.h"
 #include "dir.h"

diff --git a/editor.c b/editor.c
index 58e790548d28da2c4136c9e7efd293952e24726c..2d3e6be64e4a0c7241945961986f5a9042ed7e3c 100644 (file)
--- a/editor.c
+++ b/editor.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "abspath.h"
 #include "config.h"
 #include "gettext.h"
 #include "strbuf.h"

diff --git a/environment.c b/environment.c
index 82a1fc17d0b9463e874688ebe44f6ac1660aeed9..c69571f0b292be528313b7d55073ecbb166c2f97 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -8,6 +8,7 @@
  * are.
  */
 #include "cache.h"
+#include "abspath.h"
 #include "branch.h"
 #include "environment.h"
 #include "gettext.h"

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

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

diff --git a/lockfile.c b/lockfile.c
index ab6490a391d801fa5accbbdb7c3ec96e15bf6760..673c21d17a98a166a0cfc9107f115327f043a723 100644 (file)
--- a/lockfile.c
+++ b/lockfile.c
@@ -3,6 +3,7 @@
  */
 
 #include "cache.h"
+#include "abspath.h"
 #include "gettext.h"
 #include "lockfile.h"
 

diff --git a/midx.c b/midx.c
index e132ef250e4eff1fb42633b3b372c224617cbc40..b111665dcab39c696bea2f30abbabdef5c6b5e21 100644 (file)
--- a/midx.c
+++ b/midx.c
@@ -1,4 +1,5 @@
 #include "git-compat-util.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "config.h"
 #include "csum-file.h"

diff --git a/object-file.c b/object-file.c
index 39660d49dbc9a53a770d7c5cf7fafa943a06af92..bee41b30474538513140582e6b5874b4a6dbf23c 100644 (file)
--- a/object-file.c
+++ b/object-file.c
@@ -7,6 +7,7 @@
  * creation etc.
  */
 #include "git-compat-util.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/parse-options.c b/parse-options.c
index 084b4f1062115ff83cd2d8544f00926d12511902..a577cc85f67ed3b986be9b7ef4bc543cde023a67 100644 (file)
--- a/parse-options.c
+++ b/parse-options.c
@@ -1,5 +1,6 @@
 #include "git-compat-util.h"
 #include "parse-options.h"
+#include "abspath.h"
 #include "cache.h"
 #include "config.h"
 #include "commit.h"

diff --git a/path.c b/path.c
index 3f2702cbe49cf488aea5dd38f4554f6642a8d24b..3976c0d7ace006a8080c1d96279d0cfb7acb4623 100644 (file)
--- a/path.c
+++ b/path.c
@@ -2,6 +2,7 @@
  * Utilities for paths and pathnames
  */
 #include "cache.h"
+#include "abspath.h"
 #include "gettext.h"
 #include "hex.h"
 #include "repository.h"

diff --git a/pathspec.c b/pathspec.c
index 868b4d280ca72cf103523457cf745706d28e66ad..53763e272f511b036f05592896324831be258986 100644 (file)
--- a/pathspec.c
+++ b/pathspec.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "abspath.h"
 #include "config.h"
 #include "dir.h"
 #include "gettext.h"

diff --git a/remote.c b/remote.c
index edb1e07497c80a3b6db1bc3e3765c251718f25cc..2bae247a0a4c1a31a5c9cc270fee47ebdf3d29c5 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/repository.c b/repository.c
index 937fa974b38e86a1873a0e6904cd4c35ac5fd8f1..4412f63322473e3182f7af3422a16bf06b0809fd 100644 (file)
--- a/repository.c
+++ b/repository.c
@@ -4,6 +4,7 @@
  */
 #define USE_THE_INDEX_VARIABLE
 #include "cache.h"
+#include "abspath.h"
 #include "repository.h"
 #include "object-store.h"
 #include "config.h"

diff --git a/rerere.c b/rerere.c
index 9428cbca7b2b758f86e9ee3cd459a7ceb42cdb47..c3258e13902d47a71b5bc94d39e50790a264b6be 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -1,4 +1,5 @@
 #include "git-compat-util.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/scalar.c b/scalar.c
index ca19b95ce46cfdaa6f501eb487d4ba869fd0c5bd..fe61a3ebdd7834e680c5b184b22d49d5d11c9154 100644 (file)
--- a/scalar.c
+++ b/scalar.c
@@ -3,6 +3,7 @@
  */
 
 #include "cache.h"
+#include "abspath.h"
 #include "gettext.h"
 #include "parse-options.h"
 #include "config.h"

diff --git a/sequencer.c b/sequencer.c
index 7fa776b061591c85a3a9b7cb4661f4971e175688..c61c1fc4d875c58786aaa616995d0d9567091231 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "config.h"
 #include "environment.h"

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

diff --git a/strbuf.c b/strbuf.c
index b9cd593b14731ea8a2666a8522c36b5f423910b6..9633e37b62f45fe91eda67820469b0c17168bfa3 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "environment.h"
 #include "gettext.h"

diff --git a/submodule.c b/submodule.c
index 8b551e5327447c7256ab57623825a07039ee81a4..13ff333f68cf08f668754a9089584847bff88038 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "repository.h"
 #include "config.h"

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

diff --git a/tmp-objdir.c b/tmp-objdir.c
index 2a2012eb6d0d4b38c047b570ca06697ffead6dbd..fff15cb6b5cc0c4c61c4c034f7fe1e2a312869cf 100644 (file)
--- a/tmp-objdir.c
+++ b/tmp-objdir.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "tmp-objdir.h"
+#include "abspath.h"
 #include "chdir-notify.h"
 #include "dir.h"
 #include "sigchain.h"

diff --git a/trace.c b/trace.c
index efa4e2d8e08fcbcd3bf3dfa7c8364a7c06def5e4..2b41c683fc85e76b11f82e9c71ca6cd1ae6b16a0 100644 (file)
--- a/trace.c
+++ b/trace.c
@@ -22,6 +22,7 @@
  */
 
 #include "cache.h"
+#include "abspath.h"
 #include "quote.h"
 
 struct trace_key trace_default_key = { "GIT_TRACE", 0, 0, 0 };

diff --git a/trace2/tr2_dst.c b/trace2/tr2_dst.c
index 8a21dd29725a074a5f9018d7fd8d01750359baee..273260e1f1804044c7846f134e2ee22883aa4104 100644 (file)
--- a/trace2/tr2_dst.c
+++ b/trace2/tr2_dst.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "abspath.h"
 #include "sigchain.h"
 #include "trace2/tr2_dst.h"
 #include "trace2/tr2_sid.h"

diff --git a/worktree.c b/worktree.c
index 09eb522e5a9b1bec690db8f7a875211f8d08694b..b7bc4c7bb7a66b6cd4ba8a6b9b7fadb176659e74 100644 (file)
--- a/worktree.c
+++ b/worktree.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "abspath.h"
 #include "alloc.h"
 #include "gettext.h"
 #include "repository.h"

diff --git a/wrapper.c b/wrapper.c
index 0d4ceba6fc57e6334a62ad199c7076cf0650c309..df1fa6286d014469f904ad73de8d40c09f22617d 100644 (file)
--- a/wrapper.c
+++ b/wrapper.c
@@ -2,6 +2,7 @@
  * Various trivial helper wrappers around standard functions
  */
 #include "cache.h"
+#include "abspath.h"
 #include "config.h"
 #include "gettext.h"