summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-05 13:12:55 -0800
committerJunio C Hamano <gitster@pobox.com>2015-03-05 13:12:55 -0800
commitbe2804c49eb19e11578d60218575aca07792bc94 (patch)
tree42bd43dded23ee62429b547dc13efb5864166c9c
parent552f6994d2650f5940b98ff52679ee63959027f9 (diff)
parent5d308512ffde7efa6b5aad9549320b394b79b740 (diff)
downloadgit-be2804c49eb19e11578d60218575aca07792bc94.tar.gz
Merge branch 'dp/remove-duplicated-header-inclusion' into maint
Code clean-up. * dp/remove-duplicated-header-inclusion: do not include the same header twice
-rw-r--r--builtin/fetch.c1
-rw-r--r--trailer.c1
-rw-r--r--transport-helper.c1
-rw-r--r--userdiff.c1
4 files changed, 0 insertions, 4 deletions
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;