From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Robert Pluim Newsgroups: gmane.emacs.devel Subject: [PATCH] Make update_autogen work in git worktrees Date: Thu, 22 Mar 2018 10:40:42 +0100 Message-ID: <87po3wbg85.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1521711538 22075 195.159.176.226 (22 Mar 2018 09:38:58 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 22 Mar 2018 09:38:58 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 22 10:38:54 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eywgQ-0005bV-MM for ged-emacs-devel@m.gmane.org; Thu, 22 Mar 2018 10:38:54 +0100 Original-Received: from localhost ([::1]:59663 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eywiT-0006US-Ti for ged-emacs-devel@m.gmane.org; Thu, 22 Mar 2018 05:41:01 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36332) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eywiH-0006U3-IH for emacs-devel@gnu.org; Thu, 22 Mar 2018 05:40:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eywiD-00013N-LO for emacs-devel@gnu.org; Thu, 22 Mar 2018 05:40:49 -0400 Original-Received: from mail-wr0-x22c.google.com ([2a00:1450:400c:c0c::22c]:35687) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eywiD-00012E-E9 for emacs-devel@gnu.org; Thu, 22 Mar 2018 05:40:45 -0400 Original-Received: by mail-wr0-x22c.google.com with SMTP id 80so6877516wrb.2 for ; Thu, 22 Mar 2018 02:40:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:mail-followup-to:mail-copies-to:gmane-reply-to-list :date:message-id:mime-version; bh=kiaEufG6o8D0VXpnOUtb2bSogXQCdy3eNz6jBkxCEic=; b=qKIW99dXsOw5q9niviDMRn2vj5dkAtRXqcU6VO/8xBwkFxUt6D2RlT1M8GhIIYrx9W q12aoMWqOAVdBgXTGHm0/FFCMdxzP/AGGWfMuLeIeIxioSzfboSNNa3tnC4BahHLYvgX ZloxR5szlODFnRpjnpn3pGfuSHbY7DWqcL9ksSzAicv/DmyqR+OPSDqQ96Cnbhl+evls wNKsYm9y0wexrvxNYOfsukaZ2vg1ojV0EKI5vrjKrY/ohXFOVIsI6O7YXZ5p1hg86Ki7 8lFMHE40oP3eOn6cID8lq+wa6HQ8AOGk0171SmX/vnypfNTxBQW75YJQceWOYqyvil5H saxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:mail-followup-to:mail-copies-to :gmane-reply-to-list:date:message-id:mime-version; bh=kiaEufG6o8D0VXpnOUtb2bSogXQCdy3eNz6jBkxCEic=; b=YyjlrBX6Cr/45RuW8QcvmHXK94JIi1RU29XLlRfqx3CswND0VxWI9Cl6D2ti5pgPQ6 7kc5IBB1KSAVX90UGIf/njhn0qydTMOJOS+2hLJ3THCzVk+yZ0NCJH13JUth5BtXE2Jb O9bgXavRhBWHRbHjr93OOfJSj7yG2Yf5HC0pAuCYHb2NlemLC6p/21f5sJUpSfXHYjnA hiNrcS7a0ysLkL76P4CbxoMOQDk/qoHs4pj6ZswYXR6OL/CZHTLLeo0W8y5kLOwfe+In Tf3lx6NHlQJvbskK992bfuKG5rWJqzGVVqf/rww7fmWd6v0uzY+eqyUC7JVyZc8a6wFX e5Gg== X-Gm-Message-State: AElRT7E/JF6TkhmaCvEHYKoQv655yyO+R0IRumMj8O9N46Qawx+r76wk KyYAjALdnDQ5eJIAJOuOlkaH2Ktt X-Google-Smtp-Source: AG47ELviL8o4aelkCGJTEoDYv0XZjVPcNOWWq3Ffz0nzgE3ROrLB8r57g+YAP0LiOKtCPqsiaBFytQ== X-Received: by 10.223.184.56 with SMTP id h53mr18674847wrf.87.1521711643938; Thu, 22 Mar 2018 02:40:43 -0700 (PDT) Original-Received: from rpluim-ubuntu ([149.5.228.1]) by smtp.gmail.com with ESMTPSA id v68sm5312767wmv.29.2018.03.22.02.40.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Mar 2018 02:40:43 -0700 (PDT) Mail-Followup-To: emacs-devel@gnu.org Mail-Copies-To: never Gmane-Reply-To-List: yes X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22c X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:223910 Archived-At: --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Make-update_autogen-work-in-git-worktrees.patch >From 6c1791a2f10ad0559ea854d36e6c936e5756f087 Mon Sep 17 00:00:00 2001 From: Robert Pluim 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 --=-=-=--