From: John J Foerch <jjfoerch@earthlink.net>
To: emacs-orgmode@gnu.org
Subject: Re: org-attach-commit optional
Date: Thu, 11 Feb 2016 13:32:27 -0500 [thread overview]
Message-ID: <87egcjrtc4.fsf@hecubus.retroj.net> (raw)
In-Reply-To: 87bn7n5f5s.fsf@nicolasgoaziou.fr
[-- Attachment #1: Type: text/plain, Size: 939 bytes --]
Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
> Hello,
>
> John J Foerch <jjfoerch@earthlink.net> writes:
>
>> I would be glad to do the paperwork, but as it's such a simple change, I
>> have no objections to anybody else implementing this feature request in
>> my place if they want to. I think it would save time.
>
> There is no rush. Besides, your patch can still fit within the
> TINYCHANGE limit, albeit it would unfortunately be the last one.
>
>> Let me know if this works for this community, or whether it is
>> preferred for me to go through the FSF process.
>
> I think the best solution for the community is to finish the patch and
> apply it with a TINYCHANGE tag, while at the same time going through the
> FSF process for future patches. It's always best to eat the cake and
> have it too.
>
> Regards,
Okay, will do. Here is an updated version of the patch. I started the
process for copyright assignment as well.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: org-attach make use of git optional --]
[-- Type: text/x-diff, Size: 1373 bytes --]
From e89c4e833deb6a55bbb2aa231afebe0fe8bd7f23 Mon Sep 17 00:00:00 2001
From: John Foerch <jjfoerch@earthlink.net>
Date: Wed, 10 Feb 2016 17:37:03 -0500
Subject: [PATCH] org-attach: Make use of git optional
* lisp/org-attach.el (org-attach-commit): New variable.
(org-attach-attach): Use new variable.
TINYCHANGE
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index 15d4841..ebea435 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -55,6 +55,14 @@ where the Org file lives."
:group 'org-attach
:type 'directory)
+(defcustom org-attach-commit t
+ "If non-nil commit attachments with git.
+This is only done if the Org file is in a git repository."
+ :group 'org-attach
+ :type 'boolean
+ :version "25.1"
+ :package-version '(Org . "9.0"))
+
(defcustom org-attach-git-annex-cutoff (* 32 1024)
"If non-nil, files larger than this will be annexed instead of stored."
:group 'org-attach
@@ -373,7 +381,8 @@ METHOD may be `cp', `mv', `ln', or `lns' default taken from
((eq method 'cp) (copy-file file fname))
((eq method 'ln) (add-name-to-file file fname))
((eq method 'lns) (make-symbolic-link file fname)))
- (org-attach-commit)
+ (when org-attach-commit
+ (org-attach-commit))
(org-attach-tag)
(cond ((eq org-attach-store-link-p 'attached)
(org-attach-store-link fname))
--
2.6.4
next prev parent reply other threads:[~2016-02-11 18:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-10 22:39 org-attach-commit optional John J Foerch
2016-02-11 9:09 ` Nicolas Goaziou
2016-02-11 15:46 ` John J Foerch
2016-02-11 17:29 ` Nicolas Goaziou
2016-02-11 18:32 ` John J Foerch [this message]
2016-02-14 16:57 ` Nicolas Goaziou
2016-02-14 17:09 ` John J Foerch
2016-02-11 9:16 ` Marco Wahl
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87egcjrtc4.fsf@hecubus.retroj.net \
--to=jjfoerch@earthlink.net \
--cc=emacs-orgmode@gnu.org \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.