From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 10 Sep 2017 08:02:55 +0000 (+0900)
Subject: Merge branch 'rs/archive-excluded-directory' into maint
X-Git-Tag: v2.14.2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea8bf0009598ffa3305003d67514eafa49e14a25;p=thirdparty%2Fgit.git

Merge branch 'rs/archive-excluded-directory' into maint

"git archive" did not work well with pathspecs and the
export-ignore attribute.

We may want to resurrect the "we don't archive an empty directory"
bonus patch, but I do not mind merging the above early to 'next'
and leave it as a separate follow-up enhancement.
cf. <20170820090629.tumvqwzkromcykjf@sigill.intra.peff.net>

* rs/archive-excluded-directory:
  archive: don't queue excluded directories
  archive: factor out helper functions for handling attributes
  t5001: add tests for export-ignore attributes and exclude pathspecs
---

ea8bf0009598ffa3305003d67514eafa49e14a25