branch: externals/vc-jj commit d90028623a4e14aed596892c45f1713cbaf46ee6 Author: Wojciech Siewierski <wojci...@siewierski.eu> Commit: Wojciech Siewierski <wojci...@siewierski.eu>
Refactor vc-jj-find-ignore-file --- vc-jj.el | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/vc-jj.el b/vc-jj.el index cb3df790f4..a9bd7c02f0 100644 --- a/vc-jj.el +++ b/vc-jj.el @@ -221,11 +221,14 @@ self.hidden(), \"\\n\" "Return the .gitignore file that controls FILE." (let ((root (vc-jj-root file)) (ignore (expand-file-name - ".gitignore" - (locate-dominating-file default-directory ".gitignore")))) - (if (string-prefix-p (file-name-as-directory root) ignore) - ignore - (expand-file-name ".gitignore" root)))) + (locate-dominating-file default-directory + ".gitignore")))) + (expand-file-name + ".gitignore" + (if (string-prefix-p (file-name-as-directory root) + (file-name-as-directory ignore)) + ignore + root)))) (defun vc-jj-ignore (file &optional directory remove) "Ignore FILE under DIRECTORY.