On Sat, Aug 19, 2017 at 06:53:26PM +0200, René Scharfe wrote: > Am 19.08.2017 um 07:33 schrieb René Scharfe: > > When read_tree_recursive() encounters a directory excluded by a pathspec > > then it enters it anyway because it might contain included entries. It > > calls the callback function before it is able to decide if the directory > > is actually needed. > > > > For that reason git archive adds directories to a queue and writes > > entries for them only when it encounters the first child item -- but > > only if pathspecs with wildcards are used. Do the same for literal > > pathspecs as well, as the reasoning above applies to them, too. This > > prevents git archive from writing entries for excluded directories. > > This breaks the test "archive empty subtree with no pathspec" in t5004 by > omitting the empty directory from the archive. Sorry for missing that! > > This is kind of a bonus patch, so please discard it for now; the first > three are OK IMHO. > > A better version of this patch would at least update t5004 as well, but > there might be a better way.
I actually think it would be reasonable to omit the empty directory in t5004. The main thing we care about there is that we produce an archive with no files rather than barfing. Checking that the empty directory is actually there was mostly "this is what it happens to produce" rather than any conscious decision, I think. If the new rule is "we omit empty directories", then it would make sense for us to follow that, regardless of whether it happened by pathspec limiting or if the tree was empty in the first place (and such an empty tree is insane anyway; Git tries hard not to create them). -Peff
