diff options
| author | Eric Eaton <zaimzet@gmail.com> | 2020-01-25 05:43:25 -0800 |
|---|---|---|
| committer | Bozhidar Batsov <bozhidar@batsov.com> | 2020-01-25 15:43:25 +0200 |
| commit | 7fa35124944c28be0e8c11448849e412ed3f2eb1 (patch) | |
| tree | 3de88be87dd9fd1ac8da161bdf50e60d1ccb9e44 | |
| parent | a7c51da5d02e45ffff78093f3becb5527643a668 (diff) | |
[Fix #1475] Fix unignoring directories (#1485)
When using hybrid mode and unignoring files that are ignored by git, the
settings in .projectile would not work. The arguments to internal
function projectile-get-repo-ignored-directory were in the wrong
order. So it would return nil instead of the desired list of git ignored
files.
The issue is caught by the projectile-add-unignored test.
Co-authored-by: Bozhidar Batsov <bozhidar.batsov@gmail.com>
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | projectile.el | 2 | ||||
| -rw-r--r-- | test/projectile-test.el | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 326a392..192f246 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ * [#1385](https://github.com/bbatsov/projectile/issues/1385): Update `projectile-replace` for Emacs 27. * [#1432](https://github.com/bbatsov/projectile/issues/1432): Support .NET project. * [#1270](https://github.com/bbatsov/projectile/issues/1270): Fix running commands that don't have a default value. +* [#1475](https://github.com/bbatsov/projectile/issues/1475): Fix directories being ignored with hybrid mode despite being explicitly unignored * [#1482](https://github.com/bbatsov/projectile/issues/1482): Run a seperate grep buffer per project root * [#1488](https://github.com/bbatsov/projectile/issues/1488): Fix projectile-find-file-in-directory when in a subdir of projectile-project-root diff --git a/projectile.el b/projectile.el index 1a79671..20333e8 100644 --- a/projectile.el +++ b/projectile.el @@ -1367,7 +1367,7 @@ otherwise operates relative to project root." (let (result) (dolist (dir directories result) (setq result (append result - (projectile-get-repo-ignored-directory project vcs dir)))) + (projectile-get-repo-ignored-directory project dir vcs)))) result))) (defun projectile-add-unignored (project vcs files) diff --git a/test/projectile-test.el b/test/projectile-test.el index c64c543..c5cf90a 100644 --- a/test/projectile-test.el +++ b/test/projectile-test.el @@ -236,7 +236,7 @@ You'd normally combine this with `projectile-test-with-sandbox'." (spy-on 'projectile-project-vcs :and-return-value 'git) (spy-on 'projectile-get-repo-ignored-files :and-return-value '("path/unignored-file")) (spy-on 'projectile-get-repo-ignored-directory :and-call-fake - (lambda (project vcs dir) + (lambda (project dir vcs) (list (concat dir "unignored-file")))) (let ((projectile-globally-unignored-directories '("path"))) (expect (projectile-add-unignored nil nil '("file")) :to-equal '("file" "path/unignored-file")) |