From 6d88ee5ff0698af87f7debc9831e1bb33b059430 Mon Sep 17 00:00:00 2001 From: Erik Hetzner Date: Sat, 16 May 2015 19:10:09 -0700 Subject: [PATCH] org-attach.el: Fix check for git annex * lisp/org-attach.el (org-attach-commit): Check for .git/annex dir in addition to annex dir in root git dir to ensure that git annex is used TINYCHANGE --- lisp/org-attach.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/org-attach.el b/lisp/org-attach.el index 1737ec174..7f6191099 100644 --- a/lisp/org-attach.el +++ b/lisp/org-attach.el @@ -283,7 +283,8 @@ This checks for the existence of a \".git\" directory in that directory." (cd dir) (let ((have-annex (and org-attach-git-annex-cutoff - (file-exists-p (expand-file-name "annex" git-dir))))) + (or (file-exists-p (expand-file-name "annex" git-dir)) + (file-exists-p (expand-file-name ".git/annex" git-dir)))))) (dolist (new-or-modified (split-string (shell-command-to-string -- 2.11.4.GIT