Now that cache.h needs strbuf.h, remove useless includes.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/archive-tar.c b/archive-tar.c
index cc94cf3672cfe9e15afd74d8156fe1cf5df9e8f6..a87bc4b83eaff9a5cf3a329eada73ff7c9e557d8 100644 (file)
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -3,7 +3,6 @@
  */
 #include "cache.h"
 #include "commit.h"
  */
 #include "cache.h"
 #include "commit.h"

-#include "strbuf.h"

 #include "tar.h"
 #include "builtin.h"
 #include "archive.h"
 #include "tar.h"
 #include "builtin.h"
 #include "archive.h"

diff --git a/builtin-apply.c b/builtin-apply.c
index e5c29ebf35f2dc44b816e9756505c428c2e7a28a..1256716aece3d3e97f615cc6d8957da68d3e14d6 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -12,7 +12,6 @@
 #include "blob.h"
 #include "delta.h"
 #include "builtin.h"
 #include "blob.h"
 #include "delta.h"
 #include "builtin.h"

-#include "strbuf.h"

 
 /*
  *  --check turns on checking that the working tree matches the
 
 /*
  *  --check turns on checking that the working tree matches the

diff --git a/builtin-blame.c b/builtin-blame.c
index b004f06cd8c247a299dc399bb29bd7f12da17ef9..e364b6c6c0efed272484718e502f2b5bc18e7946 100644 (file)
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -18,7 +18,6 @@
 #include "cache-tree.h"
 #include "path-list.h"
 #include "mailmap.h"
 #include "cache-tree.h"
 #include "path-list.h"
 #include "mailmap.h"

-#include "strbuf.h"

 
 static char blame_usage[] =
 "git-blame [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [--contents <filename>] [--incremental] [commit] [--] file\n"
 
 static char blame_usage[] =
 "git-blame [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [--contents <filename>] [--incremental] [commit] [--] file\n"

diff --git a/builtin-checkout-index.c b/builtin-checkout-index.c
index 153ba7dc129d54f09268aa70ab523946007c2821..85e8efe22f6446e358427907466278d69b3bca79 100644 (file)
--- a/builtin-checkout-index.c
+++ b/builtin-checkout-index.c
@@ -38,7 +38,6 @@
  */
 #include "builtin.h"
 #include "cache.h"
  */
 #include "builtin.h"
 #include "cache.h"

-#include "strbuf.h"

 #include "quote.h"
 #include "cache-tree.h"
 
 #include "quote.h"
 #include "cache-tree.h"
 

diff --git a/builtin-commit-tree.c b/builtin-commit-tree.c
index 325334fd654696f177c82d045447bc3697af9494..88b0ab36eba6ded8f1a39e0d4c83122b7e026874 100644 (file)
--- a/builtin-commit-tree.c
+++ b/builtin-commit-tree.c
@@ -8,7 +8,6 @@
 #include "tree.h"
 #include "builtin.h"
 #include "utf8.h"
 #include "tree.h"
 #include "builtin.h"
 #include "utf8.h"

-#include "strbuf.h"

 
 #define BLOCKING (1ul << 14)
 
 
 #define BLOCKING (1ul << 14)
 

diff --git a/builtin-fetch--tool.c b/builtin-fetch--tool.c
index 90bdc32d13babeec7693cc27b48d5b1faf4b8dca..514a3cc018651d1257d9f88d78f2c208148c7f19 100644 (file)
--- a/builtin-fetch--tool.c
+++ b/builtin-fetch--tool.c
@@ -2,7 +2,6 @@
 #include "cache.h"
 #include "refs.h"
 #include "commit.h"
 #include "cache.h"
 #include "refs.h"
 #include "commit.h"

-#include "strbuf.h"

 
 static char *get_stdin(void)
 {
 
 static char *get_stdin(void)
 {

diff --git a/builtin-rerere.c b/builtin-rerere.c
index 826d346fbcd9c015e027f31ce92e8294081cbdda..58288f61a3861df757f8299e168e847943915e6b 100644 (file)
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -1,7 +1,6 @@
 #include "builtin.h"
 #include "cache.h"
 #include "path-list.h"
 #include "builtin.h"
 #include "cache.h"
 #include "path-list.h"

-#include "strbuf.h"

 #include "xdiff/xdiff.h"
 #include "xdiff-interface.h"
 
 #include "xdiff/xdiff.h"
 #include "xdiff-interface.h"
 

diff --git a/builtin-stripspace.c b/builtin-stripspace.c
index c4cf2f05ca13adeb340b3274b0f029c7734af834..1ce284710c77ef260d7f64f561e7acc0bed4a3ca 100644 (file)
--- a/builtin-stripspace.c
+++ b/builtin-stripspace.c
@@ -1,6 +1,5 @@
 #include "builtin.h"
 #include "cache.h"
 #include "builtin.h"
 #include "cache.h"

-#include "strbuf.h"

 
 /*
  * Returns the length of a line, without trailing spaces.
 
 /*
  * Returns the length of a line, without trailing spaces.

diff --git a/builtin-tag.c b/builtin-tag.c
index 9f293421da389e5a0a50edf8ef269c5065483746..82ebda11b02b2fd1fad3e3687832bb222e84f500 100644 (file)
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -8,7 +8,6 @@
 
 #include "cache.h"
 #include "builtin.h"
 
 #include "cache.h"
 #include "builtin.h"

-#include "strbuf.h"

 #include "refs.h"
 #include "tag.h"
 #include "run-command.h"
 #include "refs.h"
 #include "tag.h"
 #include "run-command.h"

diff --git a/builtin-update-index.c b/builtin-update-index.c
index 9240a288a78239067dc71b5669f7136a4c0c4a0c..1091f1b26f0c19930ccf8b615d1c0eeeaf586f47 100644 (file)
--- a/builtin-update-index.c
+++ b/builtin-update-index.c
@@ -4,7 +4,6 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 #include "cache.h"
  * Copyright (C) Linus Torvalds, 2005
  */
 #include "cache.h"

-#include "strbuf.h"

 #include "quote.h"
 #include "cache-tree.h"
 #include "tree-walk.h"
 #include "quote.h"
 #include "cache-tree.h"
 #include "tree-walk.h"

diff --git a/cache-tree.c b/cache-tree.c
index 8f53c99f154ba2a717d7b99eea9249b5e6ee2fba..5471844af66ad8d3fe023d63acccdd1a24c4bb6e 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -1,5 +1,4 @@
 #include "cache.h"
 #include "cache.h"

-#include "strbuf.h"

 #include "tree.h"
 #include "cache-tree.h"
 
 #include "tree.h"
 #include "cache-tree.h"
 

diff --git a/convert.c b/convert.c
index 00a341c595ebb6ac6965001cce84d3d4e65f60c3..508d30b2f162b5d4dd8ad119d456dc6b32d21d87 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -1,7 +1,6 @@
 #include "cache.h"
 #include "attr.h"
 #include "run-command.h"
 #include "cache.h"
 #include "attr.h"
 #include "run-command.h"

-#include "strbuf.h"

 
 /*
  * convert.c - convert a file when checking it out and checking it in.
 
 /*
  * convert.c - convert a file when checking it out and checking it in.

diff --git a/diff.c b/diff.c
index f41bcd94ab4020ab243aa48e54bb90b07ae2c881..56b672c4f0cb6287f03230e11b18ebf8fd81b744 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -9,7 +9,6 @@
 #include "xdiff-interface.h"
 #include "color.h"
 #include "attr.h"
 #include "xdiff-interface.h"
 #include "color.h"
 #include "attr.h"

-#include "strbuf.h"

 
 #ifdef NO_FAST_WORKING_DIRECTORY
 #define FAST_WORKING_DIRECTORY 0
 
 #ifdef NO_FAST_WORKING_DIRECTORY
 #define FAST_WORKING_DIRECTORY 0

diff --git a/fast-import.c b/fast-import.c
index 2c0bfb9fabb114305df2bbe6fc6b15284197951d..1866d346bfb62cd80870edb0a7c595218c9f81c4 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -149,7 +149,6 @@ Format of STDIN stream:
 #include "pack.h"
 #include "refs.h"
 #include "csum-file.h"
 #include "pack.h"
 #include "refs.h"
 #include "csum-file.h"

-#include "strbuf.h"

 #include "quote.h"
 
 #define PACK_ID_BITS 16
 #include "quote.h"
 
 #define PACK_ID_BITS 16

diff --git a/fetch.c b/fetch.c
index dd6ed9e41cf7ebbd304568f422da0b14a5e01d27..c256e6f6b45212a1dc99646d0ed3d234c087d96c 100644 (file)
--- a/fetch.c
+++ b/fetch.c
@@ -6,7 +6,6 @@
 #include "tag.h"
 #include "blob.h"
 #include "refs.h"
 #include "tag.h"
 #include "blob.h"
 #include "refs.h"

-#include "strbuf.h"

 
 int get_tree = 0;
 int get_history = 0;
 
 int get_tree = 0;
 int get_history = 0;

diff --git a/imap-send.c b/imap-send.c
index ecd4216a560095a00a7da5bbe41655aa97f56731..86e4a0f6a06e7c66b67de6639a93b20223bbda19 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -23,7 +23,6 @@
  */
 
 #include "cache.h"
  */
 
 #include "cache.h"

-#include "strbuf.h"

 
 typedef struct store_conf {
        char *name;
 
 typedef struct store_conf {
        char *name;

diff --git a/mktag.c b/mktag.c
index 7567f9ec29f2c0ac614b558c56b3656620b8bcdf..b05260c83fd8ef766eb2e16fa355501bf1f62fb5 100644 (file)
--- a/mktag.c
+++ b/mktag.c
@@ -1,5 +1,4 @@
 #include "cache.h"
 #include "cache.h"

-#include "strbuf.h"

 #include "tag.h"
 
 /*
 #include "tag.h"
 
 /*

diff --git a/mktree.c b/mktree.c
index 3891cd9fb31bf9aa84a339a70c474c38569affa5..5dab4bd367c3d62b288b34abb23c083326fc41b9 100644 (file)
--- a/mktree.c
+++ b/mktree.c
@@ -4,7 +4,6 @@
  * Copyright (c) Junio C Hamano, 2006
  */
 #include "cache.h"
  * Copyright (c) Junio C Hamano, 2006
  */
 #include "cache.h"

-#include "strbuf.h"

 #include "quote.h"
 #include "tree.h"
 
 #include "quote.h"
 #include "tree.h"
 

diff --git a/sha1_file.c b/sha1_file.c
index 64b5b46698b617319d727b2c4b8f34b9b91906fd..59325d46bec1ec604e65f9e5414cd75bba929c63 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -14,7 +14,6 @@
 #include "tag.h"
 #include "tree.h"
 #include "refs.h"
 #include "tag.h"
 #include "tree.h"
 #include "refs.h"

-#include "strbuf.h"

 
 #ifndef O_NOATIME
 #if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
 
 #ifndef O_NOATIME
 #if defined(__linux__) && (defined(__i386__) || defined(__PPC__))

diff --git a/strbuf.c b/strbuf.c
index ff551ac9ff6f8122e698be1f72c763c99bd790e5..c5f9e2a28f1441e0ae79e3cac3a3640bf943ed52 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -1,5 +1,4 @@
 #include "cache.h"
 #include "cache.h"

-#include "strbuf.h"

 
 void strbuf_init(struct strbuf *sb, size_t hint)
 {
 
 void strbuf_init(struct strbuf *sb, size_t hint)
 {