summaryrefslogtreecommitdiff
path: root/mergetools/meld
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2013-03-28 17:50:04 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-28 21:48:27 -0700
commitefa5f82540ac0ea75ac185324a78fa230befa050 (patch)
tree5bbe49cc5624233f5cc6009e74f2114b8c597c64 /mergetools/meld
parentdir.c::match_pathname(): pay attention to the length of string parameters (diff)
downloadtgif-efa5f82540ac0ea75ac185324a78fa230befa050.tar.xz
t: check that a pattern without trailing slash matches a directory
Prior to v1.8.1.1, with: git init echo content >foo && mkdir subdir && echo content >subdir/bar && echo "subdir export-ignore" >.gitattributes git add . && git commit -m one && git archive HEAD | tar tf - the resulting archive would contain only "foo" and ".gitattributes", not subdir. This was broken with a recent change that intended to allow "subdir/ export-ignore" to also exclude the directory, but instead ended up _requiring_ the trailing slash by mistake. A pattern "subdir" should match any path "subdir", whether it is a directory or a non-directory. A pattern "subdir/" insists that a path "subdir" must be a directory for it to match. This patch adds test not just for this simple case, but also for deeper cross-directory cases, as well as cases with wildcards. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/meld')
0 files changed, 0 insertions, 0 deletions