From: Paul Eggert <eggert@cs.ucla.edu>
To: Michael Brand <michael.ch.brand@gmail.com>, emacs-devel@gnu.org
Subject: Re: OS X (configure --with-ns) typing unresponsive with Org and Viper
Date: Sat, 14 May 2016 10:26:36 -0700 [thread overview]
Message-ID: <57375FCC.10907@cs.ucla.edu> (raw)
In-Reply-To: <CALn3zohna34BRYYfH+9bersrYLqxoR=N87Cuz8tsuv1P7fh8yg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 438 bytes --]
Michael Brand wrote:
> In autogen.sh "git rev-parse --git-common-dir 2>/dev/null"
> => "--git-common-dir" which looks wrong. My git version is 2.4.9
> (Apple Git-60).
>
> What am I doing wrong?
Nothing, Apple is just mired in the past. Git 2.4 was released when, 2015? I
installed the attached patch into Emacs to try to cater better to Git laggards.
Please give the patch a try. (This is Emacs. We *love* old software! :-)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Port-autogen.sh-to-Git-2.4.patch --]
[-- Type: text/x-diff; name="0001-Port-autogen.sh-to-Git-2.4.patch", Size: 1132 bytes --]
From 9105be11e61ea355e1168ac911c13fe7553de04d Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 14 May 2016 10:24:22 -0700
Subject: [PATCH] Port autogen.sh to Git 2.4
Problem reported by Michael Brand in:
http://lists.gnu.org/archive/html/emacs-devel/2016-05/msg00367.html
* autogen.sh (git_config): Don't assume that git rev-parse
groks --git-common-dir.
---
autogen.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 3809942..b1bd86b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -277,8 +277,10 @@ git_config ()
# Get location of Git's common configuration directory. For older Git
# versions this is just '.git'. Newer Git versions support worktrees.
-test -e .git && git_common_dir=`git rev-parse --git-common-dir 2>/dev/null` ||
- git_common_dir=.git
+{ test -e .git &&
+ git_common_dir=`git rev-parse --no-flags --git-common-dir 2>/dev/null` &&
+ test -n "$git_common_dir"
+} || git_common_dir=.git
hooks=$git_common_dir/hooks
# Check hashes when transferring objects among repositories.
--
2.7.4
next prev parent reply other threads:[~2016-05-14 17:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-13 18:40 OS X (configure --with-ns) typing unresponsive with Org and Viper Michael Brand
2016-05-13 19:19 ` Paul Eggert
2016-05-14 11:31 ` Michael Brand
2016-05-14 11:42 ` Michael Brand
2016-05-14 13:59 ` Noam Postavsky
2016-05-14 17:26 ` Paul Eggert [this message]
2016-05-14 17:46 ` Michael Brand
2016-05-15 20:21 ` Michael Brand
2016-05-15 21:34 ` Paul Eggert
2016-05-16 12:22 ` Stefan Monnier
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.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=57375FCC.10907@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
--cc=michael.ch.brand@gmail.com \
/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.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).