cleanups: ensure that git-compat-util.h is included first

CodingGuidelines states that the first #include in C files should be
git-compat-util.h or another header file that includes it, such as
cache.h or builtin.h.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/bulk-checkin.c b/bulk-checkin.c
index 98e651c284254b3c96c59b4f444cbc0f54edd90e..0c4b8a7cad085fa1c7760e6290f21213830eda3d 100644 (file)
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2011, Google Inc.
  */
 /*
  * Copyright (c) 2011, Google Inc.
  */

+#include "cache.h"

 #include "bulk-checkin.h"
 #include "csum-file.h"
 #include "pack.h"
 #include "bulk-checkin.h"
 #include "csum-file.h"
 #include "pack.h"

diff --git a/bulk-checkin.h b/bulk-checkin.h
index 4f599f88414df22856e1a680e021dfe1170e5024..fbd40fc98c955c192a6de698a75b8d56af766f09 100644 (file)
--- a/bulk-checkin.h
+++ b/bulk-checkin.h
@@ -4,8 +4,6 @@
 #ifndef BULK_CHECKIN_H
 #define BULK_CHECKIN_H
 
 #ifndef BULK_CHECKIN_H
 #define BULK_CHECKIN_H
 

-#include "cache.h"
-

 extern int index_bulk_checkin(unsigned char sha1[],
                              int fd, size_t size, enum object_type type,
                              const char *path, unsigned flags);
 extern int index_bulk_checkin(unsigned char sha1[],
                              int fd, size_t size, enum object_type type,
                              const char *path, unsigned flags);

diff --git a/http.c b/http.c
index c8cd50dd0c2b2213a86957cd4b24c03c0d85717d..c0663cd41f3406c8b43ae562a575b2bd5c283801 100644 (file)
--- a/http.c
+++ b/http.c
@@ -1,3 +1,4 @@
+#include "git-compat-util.h"

 #include "http.h"
 #include "pack.h"
 #include "sideband.h"
 #include "http.h"
 #include "pack.h"
 #include "sideband.h"

diff --git a/merge-recursive.c b/merge-recursive.c
index 1d332b8bbbf076b819e2052c84874fb0728dae02..b55a0056e4770d510d81df84cfd7bcb949996016 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3,8 +3,8 @@
  * Fredrik Kuivinen.
  * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
  */
  * Fredrik Kuivinen.
  * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
  */

-#include "advice.h"

 #include "cache.h"
 #include "cache.h"

+#include "advice.h"

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

diff --git a/sigchain.c b/sigchain.c
index 1118b99e57d3308f333c56f487329a8fef75a7df..faa375d5d8e7cf6bbba599034308028efaba1e0f 100644 (file)
--- a/sigchain.c
+++ b/sigchain.c
@@ -1,5 +1,5 @@
-#include "sigchain.h"

 #include "cache.h"
 #include "cache.h"

+#include "sigchain.h"

 
 #define SIGCHAIN_MAX_SIGNALS 32
 
 
 #define SIGCHAIN_MAX_SIGNALS 32
 

diff --git a/test-regex.c b/test-regex.c
index b5bfd54139fda811a30a4e56a7098bccba7039ce..0dc598ecdc2696af956b1c517166f9e28b37dc68 100644 (file)
--- a/test-regex.c
+++ b/test-regex.c
@@ -1,4 +1,4 @@
-#include <git-compat-util.h>
+#include "git-compat-util.h"

 
 int main(int argc, char **argv)
 {
 
 int main(int argc, char **argv)
 {

diff --git a/test-sigchain.c b/test-sigchain.c
index 42db234e871908514814c9b8dc50cc65d9b093cd..e499fce60ff50069ace6174ef9fa3ca4aff0cdc8 100644 (file)
--- a/test-sigchain.c
+++ b/test-sigchain.c
@@ -1,5 +1,5 @@
-#include "sigchain.h"

 #include "cache.h"
 #include "cache.h"

+#include "sigchain.h"

 
 #define X(f) \
 static void f(int sig) { \
 
 #define X(f) \
 static void f(int sig) { \

diff --git a/varint.c b/varint.c
index 4ed772949651005055dadd236cee8d5d5c8f2492..409c4977a1e3a3a72dcd1452b41abdcb5a42b665 100644 (file)
--- a/varint.c
+++ b/varint.c
@@ -1,3 +1,4 @@
+#include "git-compat-util.h"

 #include "varint.h"
 
 uintmax_t decode_varint(const unsigned char **bufp)
 #include "varint.h"
 
 uintmax_t decode_varint(const unsigned char **bufp)

diff --git a/varint.h b/varint.h
index 032119579694f6a82f3947bfafb05a801385cb5a..c1c44d9a6bde4853f55d6c8d7cd59ad159ef4abb 100644 (file)
--- a/varint.h
+++ b/varint.h
@@ -1,8 +1,6 @@
 #ifndef VARINT_H
 #define VARINT_H
 
 #ifndef VARINT_H
 #define VARINT_H
 

-#include "git-compat-util.h"
-

 extern int encode_varint(uintmax_t, unsigned char *);
 extern uintmax_t decode_varint(const unsigned char **);
 
 extern int encode_varint(uintmax_t, unsigned char *);
 extern uintmax_t decode_varint(const unsigned char **);