From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Duy Nguyen <pclouds@gmail.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH] pathspec: remove check_path_for_gitlink
Date: Thu, 5 May 2016 17:28:35 -0700 [thread overview]
Message-ID: <CAGZ79kYB5-66tA5zoSpUTHVa-rdn551DXxVoiQ6KhOWadhAzLg@mail.gmail.com> (raw)
In-Reply-To: <xmqqpot06oys.fsf@gitster.mtv.corp.google.com>
On Thu, May 5, 2016 at 4:54 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Stefan Beller <sbeller@google.com> writes:
>
>> That was my first reaction as well. However after a while of thought I actually
>> like that bug. Consider the possibilities how gitk/git-gui or other subsystems
>> can be developed. When accepting a patch for that you can either apply the
>> patch in the outer or inner repository, depending on what the sender used.
>>
>> I am not so sure if it is a bug plain and simple, but devolved into a
>> "feature" now.
>
> I'd freely admit that I have not considered its possible upsides at
> all. When deep/in/ is an unrelated repository, and running either
>
> git add deep/in/the
> git add deep/in/the/tree
I think that doesn't work (I did not test), but the crucial part is to add
a trailing '/'. E.g. `git add deep/in/the/` adds the 'the/**' tree of
the nested
repository.
>
> would add deep/in/the/tree/is-a-leaf.txt to my index, but if I did
>
> git add deep/in
>
> I'd lose that and suddenly everything there turns into a submodule.
Yes.
git add deep/in # adds a submodule
however:
git add deep/in/ # adds all files of the sub-"repo" as indpendent files
git commit -a -m "new files"
git -C deep/in reset --hard HEAD^
git diff
# shows a difference in deep/in/the/tree/is-a-leaf.txt
>
> And that is enough for me to declare that it is not worth my time to
> consider possible upside of that hole. Can you tell offhand what
> would happen if you do "git add deep" (before adding deep/in as a
> submodule) without experimenting?
>
Not really. My expectation is to add everything *but* the deep/in/ repo
as this is not exercising the bug/feature.
next prev parent reply other threads:[~2016-05-06 0:28 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-05 22:31 [PATCH] pathspec: remove check_path_for_gitlink Stefan Beller
2016-05-05 23:09 ` Junio C Hamano
2016-05-05 23:15 ` Stefan Beller
2016-05-05 23:27 ` Junio C Hamano
2016-05-05 23:32 ` Stefan Beller
2016-05-05 23:54 ` Junio C Hamano
2016-05-06 0:28 ` Stefan Beller [this message]
2016-05-06 6:21 ` Junio C Hamano
2016-05-06 6:58 ` Stefan Beller
2016-05-06 7:14 ` Junio C Hamano
2016-05-06 10:30 ` Duy Nguyen
2016-05-06 17:13 ` Stefan Beller
2016-05-06 19:02 ` Junio C Hamano
2016-05-06 19:18 ` Stefan Beller
2016-05-06 20:09 ` Junio C Hamano
2016-05-07 7:16 ` Duy Nguyen
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=CAGZ79kYB5-66tA5zoSpUTHVa-rdn551DXxVoiQ6KhOWadhAzLg@mail.gmail.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@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).