From: René Scharfe Date: Sat, 19 Aug 2017 05:32:37 +0000 (+0200) Subject: archive: don't queue excluded directories X-Git-Tag: v2.14.2~23^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5ff247ac0cc9b2d09c8c24bd0c8df12eed94aebc?ds=inline;hp=5ff247ac0cc9b2d09c8c24bd0c8df12eed94aebc archive: don't queue excluded directories Reject directories with the attribute export-ignore already while queuing them. This prevents read_tree_recursive() from descending into them and this avoids write_archive_entry() rejecting them later on, which queue_or_write_archive_entry() is not prepared for. Borrow the existing strbuf to build the full path to avoid string copies and extra allocations; just make sure we restore the original value before moving on. Keep checking any other attributes in write_archive_entry() as before, but avoid checking them twice. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano ---