From: Glen Choo <chooglen@google.com>
To: Junio C Hamano <gitster@pobox.com>,
Glen Choo via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] submodule: show inconsistent .gitmodules precedence
Date: Tue, 27 Jun 2023 18:36:58 -0700 [thread overview]
Message-ID: <kl6lsfacqsed.fsf@chooglen-macbookpro.roam.corp.google.com> (raw)
In-Reply-To: <xmqqo7l0e5x3.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
> The last-one-wins sounds like a natural outcome for reusing the
> config reading machinery, and the first-one-wins sounds like a total
> confusion, but we probably should fail any operation before the user
> fixes the .gitmodules by removing all but one path for each
> submodule.
An informal poll amongst Googlers suggests that my team mostly agrees:
last-one-wins makes more sense than first-one-wins, but erroring out is
the most sensible thing to do.
I'm not sure how reasonable it is to just fail. It makes sense if we
were only reading .gitmodules from the working tree (the user can fix
that), but we also read .gitmodules from commits, and I don't see (yet)
how a user could reasonably recover from that.
prev parent reply other threads:[~2023-06-28 1:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-27 23:57 [PATCH] submodule: show inconsistent .gitmodules precedence Glen Choo via GitGitGadget
2023-06-28 1:23 ` Junio C Hamano
2023-06-28 1:36 ` Glen Choo [this message]
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=kl6lsfacqsed.fsf@chooglen-macbookpro.roam.corp.google.com \
--to=chooglen@google.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox