From: Robert Pluim <rpluim@gmail.com>
To: emacs-devel@gnu.org
Subject: [PATCH] Make update_autogen work in git worktrees
Date: Thu, 22 Mar 2018 10:40:42 +0100 [thread overview]
Message-ID: <87po3wbg85.fsf@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
Hi,
update_autogen currently insists on have a real git repo to work in,
but it works fine in a git worktree with the attached applied. 'git
rev-parse --git-dir' has existed since at least git 0.99. OK for
master?
Robert
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Make-update_autogen-work-in-git-worktrees.patch --]
[-- Type: text/x-diff, Size: 749 bytes --]
From 6c1791a2f10ad0559ea854d36e6c936e5756f087 Mon Sep 17 00:00:00 2001
From: Robert Pluim <rpluim@gmail.com>
Date: Thu, 22 Mar 2018 09:06:44 +0100
Subject: [PATCH] Make update_autogen work in git worktrees
* admin/update_autogen: Make it work in a git worktree
---
admin/update_autogen | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/admin/update_autogen b/admin/update_autogen
index d211867479..f4c2c39825 100755
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -47,7 +47,7 @@ PD=
cd ../
[ -d admin ] || die "Could not locate admin directory"
-[ -d .git ] || die "No .git directory"
+[ -d .git ] || git rev-parse --git-dir > /dev/null 2>&1 || die "Not in a git repository"
usage ()
{
--
2.16.1.72.g5be1f00a9
next reply other threads:[~2018-03-22 9:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-22 9:40 Robert Pluim [this message]
2018-03-22 10:30 ` [PATCH] Make update_autogen work in git worktrees Andreas Schwab
2018-03-22 10:53 ` Robert Pluim
2018-03-23 5:55 ` Paul Eggert
2018-03-23 8:21 ` Robert Pluim
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=87po3wbg85.fsf@gmail.com \
--to=rpluim@gmail.com \
--cc=emacs-devel@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.