diff options
author | Erik Hetzner <egh@e6h.org> | 2015-05-16 19:10:09 -0700 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2015-05-17 10:20:58 +0200 |
commit | 6d88ee5ff0698af87f7debc9831e1bb33b059430 (patch) | |
tree | 7cf11ab0612b8a9ef483e5c0221beae21eeab3c8 | |
parent | 45555db2bdb15333bc69d89db78c2372b5f1699f (diff) | |
download | org-mode-6d88ee5ff0698af87f7debc9831e1bb33b059430.tar.gz |
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
-rw-r--r-- | lisp/org-attach.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org-attach.el b/lisp/org-attach.el index 1737ec1..7f61910 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 |