From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Aug 2015 18:01:13 +0000 (-0700)
Subject: Merge branch 'ee/clean-remove-dirs'
X-Git-Tag: v2.6.0-rc0~112
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54d673f25d571ac2d8f50b1ccea4a7d69ca8a056;p=thirdparty%2Fgit.git

Merge branch 'ee/clean-remove-dirs'

Replace "is this subdirectory a separate repository that should not
be touched?" check "git clean" does by checking if it has .git/HEAD
using the submodule-related code with a more optimized check.

* ee/clean-remove-dirs:
  read_gitfile_gently: fix use-after-free
  clean: improve performance when removing lots of directories
  p7300: add performance tests for clean
  t7300: add tests to document behavior of clean and nested git
  setup: sanity check file size in read_gitfile_gently
  setup: add gentle version of read_gitfile
---

54d673f25d571ac2d8f50b1ccea4a7d69ca8a056