From: Phil Sainty <phil@catalyst.net.nz>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
pclouds@gmail.com, git@vger.kernel.org, hvoigt@hvoigt.net,
me@ikke.info, rafa.almas@gmail.com
Subject: Re: Adding nested repository with slash adds files instead of gitlink
Date: Wed, 14 Aug 2024 11:13:25 +1200 [thread overview]
Message-ID: <s5wed6rg5c6.fsf@catalyst.net.nz> (raw)
In-Reply-To: <xmqqle105oko.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
> Let me make sure I understand the above. You create a commit to
> contain the change in the submodule and at the same time create a
> new commit to bind the updated submodule commit to superproject tree.
I can imagine this ability also being useful, but it would be an
independent feature from the one initially requested here...
> But I did not get the impression that it is what the original poster
> wants. My reading of the original thread (this is a resurrection of
> an antient thread dating back to 2018) was that you have a submodule
> at path S, you muck with a file in S/file, and you want to commit in
> the context of the superproject, having the superproject track S/file
> in its history (not just S gitlink).
That's correct.
My common usage was that I would add the entire contents of S, along
with some associated configuration outside of S, and then make a commit
of all of that in the superproject.
The two repos (superproject and submodule S) are then tracking the files
in S independently; so if I was to pull new changes to the submodule
from its own upstream, git commands run from the S directory would not
show any changes vs the state of the submodule repo, whereas commands
run from the superproject would see new changes.
Cloning the superproject repo would produce its version of S, and
without the S/.git directory.
-Phil
next prev parent reply other threads:[~2024-08-14 3:18 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-18 11:19 Adding nested repository with slash adds files instead of gitlink Heiko Voigt
2018-06-18 15:06 ` Duy Nguyen
2018-06-18 18:12 ` Brandon Williams
2018-06-19 10:36 ` Heiko Voigt
2018-06-19 15:16 ` Duy Nguyen
2018-06-19 15:56 ` Junio C Hamano
2018-06-19 16:11 ` Duy Nguyen
2018-06-19 16:09 ` Duy Nguyen
2018-06-19 16:20 ` Duy Nguyen
2018-06-18 15:55 ` Kevin Daudt
2018-06-19 10:27 ` Heiko Voigt
2018-06-19 22:29 ` Rafael Ascensão
2018-06-20 4:39 ` Kevin Daudt
2018-06-20 11:52 ` Rafael Ascensão
2018-06-20 14:57 ` Duy Nguyen
2018-06-20 16:21 ` Rafael Ascensão
2024-08-08 11:20 ` Phil Sainty
2024-08-08 16:35 ` Junio C Hamano
2024-08-13 12:48 ` Johannes Schindelin
2024-08-13 17:18 ` Junio C Hamano
2024-08-13 23:13 ` Phil Sainty [this message]
2024-08-14 12:00 ` Johannes Schindelin
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=s5wed6rg5c6.fsf@catalyst.net.nz \
--to=phil@catalyst.net.nz \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=me@ikke.info \
--cc=pclouds@gmail.com \
--cc=rafa.almas@gmail.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;
as well as URLs for NNTP newsgroup(s).