summaryrefslogtreecommitdiff
path: root/t/t7110-reset-merge.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2014-03-10 16:37:30 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-11 12:13:42 -0700
commitcf424f5fd89bb5cd09b24c96633f8951b6fd7b54 (patch)
tree87803e931b3873051ef9b89f59a33f5c4a582867 /t/t7110-reset-merge.sh
parentGit 1.8.5.5 (diff)
downloadtgif-cf424f5fd89bb5cd09b24c96633f8951b6fd7b54.tar.xz
clean: respect pathspecs with "-d"
git-clean uses read_directory to fill in a `struct dir` with potential hits. However, read_directory does not actually check against our pathspec. It uses a simplified version that may turn up false positives. As a result, we need to check that any hits match our pathspec. We do so reliably for non-directories. For directories, if "-d" is not given we check that the pathspec matched exactly (i.e., we are even stricter, and require an explicit "git clean foo" to clean "foo/"). But if "-d" is given, rather than relaxing the exact match to allow a recursive match, we do not check the pathspec at all. This regression was introduced in 113f10f (Make git-clean a builtin, 2007-11-11). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7110-reset-merge.sh')
0 files changed, 0 insertions, 0 deletions