do not include the same header twice

A few files include the same header file directly more than once.

As all these headers protect themselves against repeated inclusion
by the "#ifndef FOO_H / #define FOO_H / ... / #endif" idiom, leave
only the first inclusion and remove the later inclusion as a no-op
clean-up.

Signed-off-by: Дилян Палаузов <git-dpa@aegee.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 7b84d35d83498bc51b06915818f63d1f365eec91..75a55e590bdc3411e5e4aeee6275fbfff4451904 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -11,7 +11,6 @@
 #include "run-command.h"
 #include "parse-options.h"
 #include "sigchain.h"
 #include "run-command.h"
 #include "parse-options.h"
 #include "sigchain.h"

-#include "transport.h"

 #include "submodule.h"
 #include "connected.h"
 #include "argv-array.h"
 #include "submodule.h"
 #include "connected.h"
 #include "argv-array.h"

diff --git a/trailer.c b/trailer.c
index 623adeb02d0e06a83d7b17a9b605ff8c6475a0bd..05b3859b476dc19f37d8715ac012c29373e8f91e 100644 (file)
--- a/trailer.c
+++ b/trailer.c
@@ -1,7 +1,6 @@
 #include "cache.h"
 #include "string-list.h"
 #include "run-command.h"
 #include "cache.h"
 #include "string-list.h"
 #include "run-command.h"

-#include "string-list.h"

 #include "commit.h"
 #include "trailer.h"
 /*
 #include "commit.h"
 #include "trailer.h"
 /*

diff --git a/transport-helper.c b/transport-helper.c
index 0224687a2316798c57315093315eafae0da0b1aa..3652b164c3b87330ae074dacc8ee8e25c518ed60 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -5,7 +5,6 @@
 #include "commit.h"
 #include "diff.h"
 #include "revision.h"
 #include "commit.h"
 #include "diff.h"
 #include "revision.h"

-#include "quote.h"

 #include "remote.h"
 #include "string-list.h"
 #include "thread-utils.h"
 #include "remote.h"
 #include "string-list.h"
 #include "thread-utils.h"

diff --git a/userdiff.c b/userdiff.c
index fad52d6392fab8aadc8f6555db5aafcde224a120..2ccbee50cb69171062e84c9a1b36baf7e31be2f8 100644 (file)
--- a/userdiff.c
+++ b/userdiff.c
@@ -1,6 +1,5 @@
 #include "cache.h"
 #include "userdiff.h"
 #include "cache.h"
 #include "userdiff.h"

-#include "cache.h"

 #include "attr.h"
 
 static struct userdiff_driver *drivers;
 #include "attr.h"
 
 static struct userdiff_driver *drivers;