Merge branch 'dp/remove-duplicated-header-inclusion'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Feb 2015 23:40:14 +0000 (15:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Feb 2015 23:40:14 +0000 (15:40 -0800)
Code clean-up.

* dp/remove-duplicated-header-inclusion:
do not include the same header twice

builtin/fetch.c
trailer.c
transport-helper.c
userdiff.c
index 7b84d35d83498bc51b06915818f63d1f365eec91..75a55e590bdc3411e5e4aeee6275fbfff4451904 100644 (file)
@@ -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"
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 "string-list.h"
 #include "commit.h"
 #include "trailer.h"
 /*
index 7441d5d515fa6a74b60b04b312f9bc4e83f4b462..7dc4a443aee0c6220dc0581d4bcfdd1d65da1d8a 100644 (file)
@@ -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"
index fad52d6392fab8aadc8f6555db5aafcde224a120..2ccbee50cb69171062e84c9a1b36baf7e31be2f8 100644 (file)
@@ -1,6 +1,5 @@
 #include "cache.h"
 #include "userdiff.h"
-#include "cache.h"
 #include "attr.h"
 
 static struct userdiff_driver *drivers;