From: Brandon Williams <bmwill@google.com>
To: Duy Nguyen <pclouds@gmail.com>
Cc: Heiko Voigt <hvoigt@hvoigt.net>,
Git Mailing List <git@vger.kernel.org>,
Stefan Beller <sbeller@google.com>
Subject: Re: Adding nested repository with slash adds files instead of gitlink
Date: Mon, 18 Jun 2018 11:12:15 -0700 [thread overview]
Message-ID: <20180618181215.GB73085@google.com> (raw)
In-Reply-To: <CACsJy8CJGditaq4CZfJctVAe9QCdapWQW=W--AumH-4RWWd=vA@mail.gmail.com>
On 06/18, Duy Nguyen wrote:
> On Mon, Jun 18, 2018 at 1:23 PM Heiko Voigt <hvoigt@hvoigt.net> wrote:
> >
> > Hi,
> >
> > I just discovered that when you have a slash at the end of a nested
> > repository, the files contained in the repository get added instead of
> > the gitlink.
> >
> > I found this when I was adding a submodule and wanted to commit a small
> > change before that. You get the slash by using tab autocompletion.
> >
> > Here is a recipe to reproduce:
> >
> > mkdir test
> > cd test; git init
> > touch a; git add a; git commit -m a
> > mkdir ../test.git; (cd ../test.git; git init --bare)
> > git remote add origin ../test.git
> > git push origin master
> > git submodule add ../test.git submodule
> > git reset
> > git add submodule/
> >
> > Now instead of just submodule gitlink there is an entry for submodule/a
> > in the index.
> >
> > I just thought I put this out there. Will have a look if I find the time
> > to cook up a proper testcase and investigate.
>
> This sounds like the submodule specific code in pathspec.c, which has
> been replaced with something else in bw/pathspec-sans-the-index. If
> you have time, try a version without those changes (e.g. v2.13 or
> before) to see if it's a possible culprit.
I just tested this with v2.13 and saw the same issue. I don't actually
think this ever worked in the way you want it to Heiko. Maybe git add
needs to be taught to be more intelligent when trying to add a submodule
which doesn't exist in the index.
--
Brandon Williams
next prev parent reply other threads:[~2018-06-18 18:12 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 [this message]
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
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=20180618181215.GB73085@google.com \
--to=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=hvoigt@hvoigt.net \
--cc=pclouds@gmail.com \
--cc=sbeller@google.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.