From: Erik Hetzner <egh@e6h.org>
To: Org Mode <emacs-orgmode@gnu.org>,
John Wiegley <johnw@newartisans.com>,
Nicolas Goaziou <mail@nicolasgoaziou.fr>
Subject: [PATCH] org-attach.el: fix check for git annex
Date: Sat, 16 May 2015 19:10:09 -0700 [thread overview]
Message-ID: <5557f883.036f440a.60dc.ffffff37@mx.google.com> (raw)
In-Reply-To: <871tisi1xs.fsf@nicolasgoaziou.fr>
* 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
---
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 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
--
2.1.4
next prev parent reply other threads:[~2015-05-17 2:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-02 19:59 org-attach + git annex not working Erik Hetzner
2015-05-04 3:41 ` John Wiegley
2015-05-07 20:10 ` Nicolas Goaziou
2015-05-17 2:10 ` Erik Hetzner [this message]
2015-05-17 8:25 ` [PATCH] org-attach.el: fix check for git annex Nicolas Goaziou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5557f883.036f440a.60dc.ffffff37@mx.google.com \
--to=egh@e6h.org \
--cc=emacs-orgmode@gnu.org \
--cc=johnw@newartisans.com \
--cc=mail@nicolasgoaziou.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).