From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martyn Jago Subject: local.mk and SUDO Date: Fri, 27 Apr 2012 13:35:48 +0100 Message-ID: Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([208.118.235.92]:50719) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SNkPC-0005Lu-RC for emacs-orgmode@gnu.org; Fri, 27 Apr 2012 08:36:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SNkP5-0003uj-QW for emacs-orgmode@gnu.org; Fri, 27 Apr 2012 08:36:10 -0400 Received: from plane.gmane.org ([80.91.229.3]:40818) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SNkP5-0003uU-Jl for emacs-orgmode@gnu.org; Fri, 27 Apr 2012 08:36:03 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1SNkP1-0001ad-Sc for emacs-orgmode@gnu.org; Fri, 27 Apr 2012 14:35:59 +0200 Received: from 88-96-171-142.dsl.zen.co.uk ([88.96.171.142]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 27 Apr 2012 14:35:59 +0200 Received: from martyn.jago by 88-96-171-142.dsl.zen.co.uk with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 27 Apr 2012 14:35:59 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org 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