From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: project.el: git submodules? Date: Fri, 15 May 2020 04:21:17 +0300 Message-ID: <91b1284a-08d0-e57c-e6e3-c9a0a8e66e8b@yandex.ru> References: <875zd1ni5i.fsf@md5i.com> <55769244-c84c-dff0-4427-9ff688f81af5@yandex.ru> <87v9l0nar5.fsf@md5i.com> <95a8c285-125f-afda-b1bc-d1c0452e5c31@yandex.ru> <1bc2052e-b26b-1f3d-f78c-a22112861f27@yandex.ru> <7b247aac-28bd-94c1-2546-524edde9b781@yandex.ru> <42510ba9-1235-7180-af36-2d9de24835b4@yandex.ru> <21e149fc-dba5-47f0-ea7f-60a16ea32819@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="129721"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 Cc: Michael Welsh Duggan , Gary Oberbrunner , Stefan Monnier , "emacs-devel@gnu.org" To: Michael Welsh Duggan Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri May 15 03:22:04 2020 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jZP35-000XeJ-Qp for ged-emacs-devel@m.gmane-mx.org; Fri, 15 May 2020 03:22:03 +0200 Original-Received: from localhost ([::1]:47830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZP34-0000Qf-Q8 for ged-emacs-devel@m.gmane-mx.org; Thu, 14 May 2020 21:22:02 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZP2R-0008RM-Dk for emacs-devel@gnu.org; Thu, 14 May 2020 21:21:23 -0400 Original-Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:43707) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jZP2Q-0005mW-Fw for emacs-devel@gnu.org; Thu, 14 May 2020 21:21:23 -0400 Original-Received: by mail-wr1-x436.google.com with SMTP id i15so1389236wrx.10 for ; Thu, 14 May 2020 18:21:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=tDPahIPsIU0AtOyATjGj8AIhwKrBSKNfrlxYndS5D/4=; b=hQHJjvBBl6MfvzrQvwrz3rTByJ9NOi4HbfNqt/gpYmt0GH9/8SdI0GHQvEdIiuSxO/ oEwY5vHXZnwN19dUWYAFGkunbEidsgXycyENM+lIujj/34ddMCjCRKr6h4NddJWfYDpP 9TRS8wKycnqj4HzG94UTBQsxTDVwEF90eAqj0agGV32/SGK8Pu0hENw6pn5BlSHKP6Ap Ra7FuABLcO2CoPhbvhxZycNHBblO48TchhZqIjeYhWPsdf6fkFkO8CYEjC+Wk0BeApVm cIPWXTUVhn/8TPg8Cubylu5uq0urOqHDOhEh3R5X6oSqUCQ+KuYgYsv+ihkFCXzujmK7 syAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=tDPahIPsIU0AtOyATjGj8AIhwKrBSKNfrlxYndS5D/4=; b=lmijRXNIYTcXAOt332GJpLxiiNg5jefo5YvbwDi26LlJcQm1z3z6UI9sCNo+Ry3yv/ WzefqgIV0/Wz9RNqy8Ossngm3mT7rVyqAXIz8xHZ5ZebBz6ecYi6u/pm4aW814Cud1Dr vMoMSrukyx30dlWrvnB2oc2xgkXSBLlT7pwYvGwe6Clr2F531UNiiBdynGPZqoNqWvte F9AITVYOq9AClIXx2MceC7t5UlEXj+9cNQfcoeqUF+iW5yXSnh2usEggEA/Iw3djBgnI e9fMCtqJREPLkTtFDzaG+5lJeUQM6ErLsVNdkWrfEQHEPu3K8RKxSQfX6+HNDrPJ/n3Z qvDg== X-Gm-Message-State: AOAM5315R6RegqIEM1KImGBZd6wAw2eGlBBzb97KHg+DUvZsQsJbZhWP s4LrlI8nne0+fXLnroYPsr1D5S7F X-Google-Smtp-Source: ABdhPJw01gIu1DrEbCCWBfqbp07Gp4jot/nuCO7EEtdXfoKl4gSHxyQfNfhnGjniZSxZWkpyL7J8WQ== X-Received: by 2002:a05:6000:128b:: with SMTP id f11mr1287178wrx.227.1589505680464; Thu, 14 May 2020 18:21:20 -0700 (PDT) Original-Received: from [192.168.0.3] ([66.205.73.129]) by smtp.googlemail.com with ESMTPSA id q2sm1049374wrx.60.2020.05.14.18.21.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 14 May 2020 18:21:19 -0700 (PDT) In-Reply-To: Content-Language: en-US Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=raaahh@gmail.com; helo=mail-wr1-x436.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 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-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:250308 Archived-At: On 15.05.2020 00:38, Michael Welsh Duggan wrote: > I think you can just look for ^gitdir:.*/\.git/modules/ > After all, I believe submodules all end up having their metadata within > .git/modules. OK. Here's a patch you can try: diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index ac56537b97..bc79e7591b 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el @@ -268,9 +268,24 @@ project-try-vc (pcase backend ('Git ;; Don't stop at submodule boundary. - (or (vc-file-getprop dir 'project-git-root) - (vc-file-setprop dir 'project-git-root - (vc-find-root dir ".git/")))) + (or (vc-file-getprop dir 'project-vc-root) + (let* ((default-directory dir) + (root (vc-root-dir))) + (vc-file-setprop + dir 'project-vc-root + (cond + ((file-directory-p ".git") + root) + ((with-temp-buffer + (insert-file-contents ".git") + (goto-char (point-min)) + (looking-at "gitdir:[./]+/\.git/modules/")) + (let* ((parent (file-name-directory + (directory-file-name root))) + (default-directory parent)) + (vc-root-dir))) + (t root))) + ))) ('nil nil) (_ (ignore-errors (vc-call-backend backend 'root dir)))))) (and root (cons 'vc root))))