From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Gary Oberbrunner Newsgroups: gmane.emacs.devel Subject: Re: project.el: git submodules? Date: Tue, 12 May 2020 15:34:36 -0400 Message-ID: References: <21d66bf4-5cae-56b7-5c59-9257e887b672@yandex.ru> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="0000000000006d571305a5788ec8" Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="82596"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue May 12 21:36:17 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 1jYahK-000LMu-Bs for ged-emacs-devel@m.gmane-mx.org; Tue, 12 May 2020 21:36:14 +0200 Original-Received: from localhost ([::1]:45836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYahJ-0004Ov-Bf for ged-emacs-devel@m.gmane-mx.org; Tue, 12 May 2020 15:36:13 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:47430) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYafz-00024U-7V for emacs-devel@gnu.org; Tue, 12 May 2020 15:34:51 -0400 Original-Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]:39004) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jYafx-0002Km-TM for emacs-devel@gnu.org; Tue, 12 May 2020 15:34:50 -0400 Original-Received: by mail-ej1-x632.google.com with SMTP id s3so12039920eji.6 for ; Tue, 12 May 2020 12:34:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oberbrunner.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=U4JfZ3CdHKCGsxjbUAGM6MEct7ZtvQJ6RSJZvCp15OA=; b=JXv42CqpmGKCw9UtcO3fvpRUZf0KkgUUbn/2ot88Vcr/E58CZP7x0KLZ/4E61SBCO2 g2t+qJHgKEdquxhibGzQyL22o7SIwQ7LMRUoLQicqRbmpLcyVooiyfeYuySS8JHScT4Q GkzMK8TSfEqqXbwhHlB1vc4Qhr//Pdjl37KAphyfI7FwU581peE0FCKlGsqprg6I+k2d QHVY2kytZnkQZ/dukDas+peUFfwPz54w1gHH27acrHJw/1NWG/s6UPY0LdzJjGXTCf1r fSHWgyP5+ITu6X8bXAOuyfyhuijYpLvMZ+gvvnq/b6kWgP73F5cSclxX5+o+5ob14MaA N6hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=U4JfZ3CdHKCGsxjbUAGM6MEct7ZtvQJ6RSJZvCp15OA=; b=q1UFIJ6zuKScj0BoE7f7CYwoFj65aZICZFRQmJgPuVHCbyCM0lhv+XJItZ54zt0Hjt F2QEGdK+xirK9ml9vKiVYi61bsiBsQLTnx8ESRjhl7oY8nrP53WmNl3dIm2XCGQeZaLg YgHHpX897B6lcUyPhRs8RCuX9q8bfmh6XGP4CbsJcQklMR3P+c22vz3QtsgO9t6Dkt43 Q6GXU0716AwwKWq4HqCH5/9ltpWrDv6lwopBMLLovv4uoS0gHLIvpvlr4IpkO1kthUux PHZ35+C9lRyToF50ibpY9cpwgHrm7v+TtFlsumFk4joVSub6FbwjeEhELptiYwP8ruVU 0MJg== X-Gm-Message-State: AGi0PuYsCacCkNTPXkZxFjgdvpIqC0joq16mqXrYnBihGxfpyXHGzp7L /kgNoaFnJE71I6HAI2Rh52RyjMvvzvZk+8cnCAn9+A== X-Google-Smtp-Source: APiQypJ0i3C4T0CW9gfCpWfAMuACh783hU6UWD5wIdj2gTMiAGPVNPKC70MP8onzItf7nxAH1Y9iP3uZTyIwnqiN2oE= X-Received: by 2002:a17:906:8402:: with SMTP id n2mr11640968ejx.26.1589312087735; Tue, 12 May 2020 12:34:47 -0700 (PDT) In-Reply-To: <21d66bf4-5cae-56b7-5c59-9257e887b672@yandex.ru> Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=garyo@oberbrunner.com; helo=mail-ej1-x632.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=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:250029 Archived-At: --0000000000006d571305a5788ec8 Content-Type: text/plain; charset="UTF-8" How common would it be? Sorry, I don't know. Someone further down in that SO article suggested your simple answer should work, but suggests that the new command is preferred. Probably just my broken config. According to that Stack Overflow article, that arg was added in git 2.13 (Q2 2017). On Tue, May 12, 2020 at 3:28 PM Dmitry Gutov wrote: > On 12.05.2020 21:33, Gary Oberbrunner wrote: > > In my case at least, you're right and my submodule is seriously > > confused. It has a .git/ dir which disagrees with the ../.git/modules > > one. That's what was causing my problem. I've been doing a lot of work > > in that submodule (multiple upstream repos, merges, pushes, etc.) and > > perhaps something I did made it create that. > > How common do you think is such problem going to be? If it's rare, I'd > rather let you fix the local configuration and leave that part of the > code in Emacs simple. Unless this comes up again, of course. > > > Apparently the correct way to do this is "git rev-parse > > --show-superproject-working-tree". See > > https://stackoverflow.com/questions/7359204 for more info. (And in > > fact that does work in my case even with my messed-up .git dir in the > > submodule.) > > Thank you. Any idea which version of Git this was added in first? We'd > have to consider that for compatibility with older systems. > -- Gary --0000000000006d571305a5788ec8 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
How common would= it be? Sorry, I don't know. Someone further down in that SO article su= ggested your simple answer should work, but suggests that the new command i= s preferred. Probably just my broken config.

= According to that Stack Overflow = article, that arg was added in git 2.13 (Q2 2017).=C2=A0

On Tue, May 12, 2020 at 3:28 PM Dmitry Gutov <dgutov@yandex.ru> wrote:
On 12.05.2020 21:33, Gary Oberbrunner wrote:<= br> > In my case at least, you're right and my submodule is seriously > confused. It has a .git/ dir which disagrees with the ../.git/modules<= br> > one. That's what was causing my problem. I've been doing a lot= of work
> in that submodule (multiple upstream repos, merges, pushes, etc.) and<= br> > perhaps something I did made it create that.

How common do you think is such problem going to be? If it's rare, I= 9;d
rather let you fix the local configuration and leave that part of the
code in Emacs simple. Unless this comes up again, of course.

> Apparently the correct way to do this is "git rev-parse
> --show-superproject-working-tree". See
> https://stackoverflow.com/questions/7359204=C2= =A0 for more info. (And in
> fact that does work in my case even with my messed-up .git dir in the<= br> > submodule.)

Thank you. Any idea which version of Git this was added in first? We'd =
have to consider that for compatibility with older systems.


--
Gary
--0000000000006d571305a5788ec8--