From: Дилян Палаузов <git-dpa@aegee.org>
Date: Fri, 13 Feb 2015 14:47:39 +0000 (+0000)
Subject: do not include the same header twice
X-Git-Tag: v2.3.2~25^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d308512ffde7efa6b5aad9549320b394b79b740;p=thirdparty%2Fgit.git

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 7b84d35d83..75a55e590b 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -11,7 +11,6 @@
 #include "run-command.h"
 #include "parse-options.h"
 #include "sigchain.h"
-#include "transport.h"
 #include "submodule.h"
 #include "connected.h"
 #include "argv-array.h"
diff --git a/trailer.c b/trailer.c
index 623adeb02d..05b3859b47 100644
--- a/trailer.c
+++ b/trailer.c
@@ -1,7 +1,6 @@
 #include "cache.h"
 #include "string-list.h"
 #include "run-command.h"
-#include "string-list.h"
 #include "commit.h"
 #include "trailer.h"
 /*
diff --git a/transport-helper.c b/transport-helper.c
index 0224687a23..3652b164c3 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -5,7 +5,6 @@
 #include "commit.h"
 #include "diff.h"
 #include "revision.h"
-#include "quote.h"
 #include "remote.h"
 #include "string-list.h"
 #include "thread-utils.h"
diff --git a/userdiff.c b/userdiff.c
index fad52d6392..2ccbee50cb 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -1,6 +1,5 @@
 #include "cache.h"
 #include "userdiff.h"
-#include "cache.h"
 #include "attr.h"
 
 static struct userdiff_driver *drivers;