Merge branch 'maint' into tj/imap-send-remove-unusedtj/maint-imap-send-remove-unused

* maint: (18123 commits)
  documentation fix: git difftool uses diff tools, not merge tools.
  Git 1.7.7.4
  Makefile: add missing header file dependencies
  notes merge: eliminate OUTPUT macro
  mailmap: xcalloc mailmap_info
  name-rev --all: do not even attempt to describe non-commit object
  Git 1.7.7.3
  docs: Update install-doc-quick
  docs: don't mention --quiet or --exit-code in git-log(1)
  Git 1.7.7.2
  t7511: avoid use of reserved filename on Windows.
  clone: Quote user supplied path in a single quote pair
  read-cache.c: fix index memory allocation
  make the sample pre-commit hook script reject names with newlines, too
  Reindent closing bracket using tab instead of spaces
  Git 1.7.7.1
  RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting
  gitweb: fix regression when filtering out forks
  Almost ready for 1.7.7.1
  pack-objects: don't traverse objects unnecessarily
  ...

Conflicts:
	imap-send.c

1 files changed, 0 insertions, 70 deletions

diff --git a/diffcore-pathspec.c b/diffcore-pathspec.c
deleted file mode 100644
index 139fe882f9..0000000000
--- a/diffcore-pathspec.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2005 Junio C Hamano
- */
-#include "cache.h"
-#include "diff.h"
-#include "diffcore.h"
-
-struct path_spec {
-	const char *spec;
-	int len;
-};
-
-static int matches_pathspec(const char *name, struct path_spec *s, int cnt)
-{
-	int i;
-	int namelen;
-
-	if (cnt == 0)
-		return 1;
-
-	namelen = strlen(name);
-	for (i = 0; i < cnt; i++) {
-		int len = s[i].len;
-		if (namelen < len)
-			continue;
-		if (memcmp(s[i].spec, name, len))
-			continue;
-		if (s[i].spec[len-1] == '/' ||
-		    name[len] == 0 ||
-		    name[len] == '/')
-			return 1;
-		if (!len)
-			return 1;
-	}
-	return 0;
-}
-
-void diffcore_pathspec(const char **pathspec)
-{
-	struct diff_queue_struct *q = &diff_queued_diff;
-	int i, speccnt;
-	struct diff_queue_struct outq;
-	struct path_spec *spec;
-
-	outq.queue = NULL;
-	outq.nr = outq.alloc = 0;
-
-	for (i = 0; pathspec[i]; i++)
-		;
-	speccnt = i;
-	if (!speccnt)
-		return;
-
-	spec = xmalloc(sizeof(*spec) * speccnt);
-	for (i = 0; pathspec[i]; i++) {
-		spec[i].spec = pathspec[i];
-		spec[i].len = strlen(pathspec[i]);
-	}
-
-	for (i = 0; i < q->nr; i++) {
-		struct diff_filepair *p = q->queue[i];
-		if (matches_pathspec(p->two->path, spec, speccnt))
-			diff_q(&outq, p);
-		else
-			diff_free_filepair(p);
-	}
-	free(q->queue);
-	*q = outq;
-	return;
-}