* ELPA: CONTRIBUTING.org and targets/
@ 2018-01-12 16:03 Tim Landscheidt
2018-01-12 16:17 ` Oleh Krehel
0 siblings, 1 reply; 2+ messages in thread
From: Tim Landscheidt @ 2018-01-12 16:03 UTC (permalink / raw)
To: fabacino, Oleh Krehel; +Cc: emacs-devel
Hi,
AFAICT, CONTRIBUTING.org and targets/ do not pertain to ELPA
itself, but to ivy and should be somewhere under
packages/ivy/.
If you want to guard (to some degree) against accidentally
modifying other packages, you can add this fragment:
| if git diff --cached --name-only -z $against | grep -qvz '^packages/ivy/'; then
| echo "Trying to modify files outside of packages/ivy/";
| exit 1
| fi
to your .git/hooks/pre-commit (I assume this won't necessar-
ily work for merge commits).
Tim
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: ELPA: CONTRIBUTING.org and targets/
2018-01-12 16:03 ELPA: CONTRIBUTING.org and targets/ Tim Landscheidt
@ 2018-01-12 16:17 ` Oleh Krehel
0 siblings, 0 replies; 2+ messages in thread
From: Oleh Krehel @ 2018-01-12 16:17 UTC (permalink / raw)
To: Tim Landscheidt; +Cc: fabacino, emacs-devel
Hi Tim,
I guess I botched "git subtree merge" on the last release. I'll fix it
this evening.
No need for fancy pre-commit hooks. But it would be nice to have a script in
the ELPA repo for merging a package from a Git upstream.
regards,
Oleh
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-01-12 16:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-12 16:03 ELPA: CONTRIBUTING.org and targets/ Tim Landscheidt
2018-01-12 16:17 ` Oleh Krehel
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.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).