org-attach + git annex not working

org-attach + git annex not working

[Erik Hetzner]

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/>.

Re: org-attach + git annex not working

[John Wiegley]

>>>>> Erik Hetzner <egh@e6h.org> writes:

> 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.

I hadn't noticed it breaking, but is it possible to make your change a bit
more defensive?  I.e., make sure the string ends in .git if it doesn't
already, rather than always appending .git?

John

Re: org-attach + git annex not working

[Nicolas Goaziou]

Hello,

Erik Hetzner <egh@e6h.org> writes:

> 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

Thank you.

Could you send it again using git format-patch, with a proper commit
message?


Regards,

-- 
Nicolas Goaziou

[PATCH] org-attach.el: fix check for git annex

[Erik Hetzner]

* 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

Re: [PATCH] org-attach.el: fix check for git annex

[Nicolas Goaziou]

Erik Hetzner <egh@e6h.org> writes:

> * 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

Applied. Thank you.

I added TINYCHANGE at the end of the commit message since you don't
appear to have signed FSF papers. Please correct me if I'm wrong.

Regards,