[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[O] org-attach + git annex not working

From: Erik Hetzner
Subject: [O] org-attach + git annex not working
Date: Sat, 02 May 2015 12:59:40 -0700
User-agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (Gojō) APEL/10.8 EasyPG/1.0.0 Emacs/25.0.50 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO)

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"))

Sent from my free software system <http://fsf.org/>.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]