* [PATCH] Make update_autogen work in git worktrees
@ 2018-03-22 9:40 Robert Pluim
2018-03-22 10:30 ` Andreas Schwab
0 siblings, 1 reply; 5+ messages in thread
From: Robert Pluim @ 2018-03-22 9:40 UTC (permalink / raw
To: emacs-devel
[-- 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Make update_autogen work in git worktrees
2018-03-22 9:40 [PATCH] Make update_autogen work in git worktrees Robert Pluim
@ 2018-03-22 10:30 ` Andreas Schwab
2018-03-22 10:53 ` Robert Pluim
0 siblings, 1 reply; 5+ messages in thread
From: Andreas Schwab @ 2018-03-22 10:30 UTC (permalink / raw
To: emacs-devel
On Mär 22 2018, Robert Pluim <rpluim@gmail.com> wrote:
> 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"
Alternatively, you could test for .git being a plain file.
Andreas.
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Make update_autogen work in git worktrees
2018-03-22 10:30 ` Andreas Schwab
@ 2018-03-22 10:53 ` Robert Pluim
2018-03-23 5:55 ` Paul Eggert
0 siblings, 1 reply; 5+ messages in thread
From: Robert Pluim @ 2018-03-22 10:53 UTC (permalink / raw
To: Andreas Schwab; +Cc: emacs-devel
Andreas Schwab <schwab@suse.de> writes:
> On Mär 22 2018, Robert Pluim <rpluim@gmail.com> wrote:
>
>> 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"
>
> Alternatively, you could test for .git being a plain file.
Yes, but I think git itself is better at working out whether weʼre in
a repository than just a script testing files.
Robert
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-03-23 8:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-22 9:40 [PATCH] Make update_autogen work in git worktrees Robert Pluim
2018-03-22 10:30 ` Andreas Schwab
2018-03-22 10:53 ` Robert Pluim
2018-03-23 5:55 ` Paul Eggert
2018-03-23 8:21 ` Robert Pluim
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.