From: Martyn Jago <martyn.jago@btinternet.com>
To: emacs-orgmode@gnu.org
Subject: local.mk and SUDO
Date: Fri, 27 Apr 2012 13:35:48 +0100 [thread overview]
Message-ID: <m2sjfps66z.fsf@btinternet.com> (raw)
I have a local.mk set up with my particular settings, and with SUDO
set to blank, as per the comment in default.mk:
,----[default.mk]
| # How to obtain administrative privileges
| # SUDO = # leave blank if you don't need this
| SUDO = sudo
`----
...since my org-mode files location doesn't require supervisor access
(typically I have 4 org-mode installs, and 4 Emacs versions for testing,
although currently I'm just running my working system).
However, when I've just gone to run `make up2' (awesome command by the
way), I get the error:
--8<---------------cut here---------------start------------->8---
> make up2
git remote update
Fetching origin
git pull
Updating abd49c8..0233eb9
error: Your local changes to the following files would be overwritten by merge:
contrib/lisp/org-export.el
lisp/ob-R.el
lisp/ob-python.el
lisp/ob.el
lisp/org-agenda.el
lisp/org-beamer.el
lisp/org-bibtex.el
lisp/org-capture.el
lisp/org-clock.el
lisp/org-colview-xemacs.el
lisp/org-colview.el
lisp/org-ctags.el
lisp/org-exp.el
lisp/org-faces.el
lisp/org-footnote.el
lisp/org-gnus.el
lisp/org-latex.el
lisp/org-mouse.el
lisp/org-odt.el
lisp/org-publish.el
lisp/org-table.el
lisp/org.el
--8<---------------cut here---------------end--------------->8---
After investigation it turns out the problem is a permissions issue:
--8<---------------cut here---------------start------------->8---
diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el
old mode 100644
new mode 100755
--8<---------------cut here---------------end--------------->8---
After further investigation, I have modified git config to overide the
core.filemode setting which works for me:
,----
| core.fileMode
| If false, the executable bit differences between the index and the
| working copy are ignored; useful on broken filesystems like FAT.
| See git-update-index(1). True by default.
`----
--8<---------------cut here---------------start------------->8---
git config core.filemode false
--8<---------------cut here---------------end--------------->8---
So really - this is just a heads-up of my experience setting SUDO to
blank, but it would be nice to know if this is expected behavior? If it
turns out that it is, then perhaps I can supply a documentation patch
(an extra comment in default.mk).
HTH
Best, Martyn
next reply other threads:[~2012-04-27 12:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-27 12:35 Martyn Jago [this message]
2012-04-27 18:11 ` local.mk and SUDO Achim Gratz
2012-04-27 20:02 ` Martyn Jago
2012-04-27 22:57 ` Achim Gratz
2012-04-29 12:59 ` Martyn Jago
2012-04-29 21:57 ` Achim Gratz
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=m2sjfps66z.fsf@btinternet.com \
--to=martyn.jago@btinternet.com \
--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 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).