From: Erik Hetzner <egh@e6h.org>
To: Org Mode <emacs-orgmode@gnu.org>
Cc: John Wiegley <johnw@newartisans.com>
Subject: org-attach + git annex not working
Date: Sat, 02 May 2015 12:59:40 -0700 [thread overview]
Message-ID: <55452cc1.c28e440a.4541.ffff8b76@mx.google.com> (raw)
Hi all,
I am trying to get org-attach to work with git-annex, but there is a
bug that prevents it working.
org-attach checks if there is an annex directory in the results of
(vc-git-root org-attach-directory) in order to decide whether to use
git-annex. But the annex directory is a subdir of the .git dir, and
vc-git-root returns the path to the directory that contains .git, not
the .git path itself, e.g. /foo not /foo/.git
I don’t know if the behavior of vc-git-root has changed, but I don’t
see anything in the emacs git log for vc/vc-git.el and it seems to
have the same behavior in 24 & 25.
The following patch fixes this issue.
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index 1737ec1..b843d48 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -276,7 +276,7 @@ the ATTACH_DIR property) their own attachment directory."
"Commit changes to git if `org-attach-directory' is properly initialized.
This checks for the existence of a \".git\" directory in that directory."
(let* ((dir (expand-file-name org-attach-directory))
- (git-dir (vc-git-root dir))
+ (git-dir (expand-file-name ".git" (vc-git-root dir)))
(changes 0))
(when (and git-dir (executable-find "git"))
(with-temp-buffer
--
Sent from my free software system <http://fsf.org/>.
next reply other threads:[~2015-05-02 20:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-02 19:59 Erik Hetzner [this message]
2015-05-04 3:41 ` org-attach + git annex not working John Wiegley
2015-05-07 20:10 ` Nicolas Goaziou
2015-05-17 2:10 ` [PATCH] org-attach.el: fix check for git annex Erik Hetzner
2015-05-17 8:25 ` 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=55452cc1.c28e440a.4541.ffff8b76@mx.google.com \
--to=egh@e6h.org \
--cc=emacs-orgmode@gnu.org \
--cc=johnw@newartisans.com \
/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).