From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Sergey Sharybin <sergey.vfx@gmail.com>
Cc: Git List <git@vger.kernel.org>, Jens Lehmann <Jens.Lehmann@web.de>
Subject: Re: Git issues with submodules
Date: Fri, 22 Nov 2013 16:46:27 +0530 [thread overview]
Message-ID: <CALkWK0n7jdLKOAFoFjuRz0aTCssorAgk2y=Vce76Y5aHWbj53Q@mail.gmail.com> (raw)
In-Reply-To: <CAErtv26Q_YN+U+trjNac1aKLi9BvNHNNuaUkrr2RE0nB+yxWsw@mail.gmail.com>
[+CC: Jens, the goto-guy for submodules]
Sergey Sharybin wrote:
> Namely, `git ls-files -m` will show addons as modified, regardless
> ignore=all configuration. In the same time `git diff-index --name-only
> HEAD --` will show no changes at all.
This happens because diff-index handles submodules explicitly (see
diff-lib.c), while ls-files doesn't (see builtin/ls-files.c). My
opinion is that this is a bug, and git ls-files needs to be taught to
handle submodules properly.
> This leads to issues with Arcanist (which is a Phabricator's tool) who
> considers addons as uncommited changes and either complains on this or
> just adds this to commits.
Does Arcanist use `git ls-files -m` to check?
> There're also some more issues which happens to our
> developers and which i can not quite reproduce.
Do try to track down the other issues and let us know.
> Sometimes it happens so git checkout to another branch yields about
> uncommited changes to addons and doesn't checkout to another branch.
I've seldom used submodules with branches, so I'll let others chime in.
Cheers.
next prev parent reply other threads:[~2013-11-22 11:17 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-22 7:53 Git issues with submodules Sergey Sharybin
2013-11-22 11:16 ` Ramkumar Ramachandra [this message]
2013-11-22 11:35 ` Sergey Sharybin
2013-11-22 13:08 ` Ramkumar Ramachandra
2013-11-22 15:11 ` Jeff King
2013-11-22 15:42 ` Sergey Sharybin
2013-11-22 16:35 ` Ramkumar Ramachandra
2013-11-22 17:01 ` Sergey Sharybin
2013-11-22 17:40 ` Sergey Sharybin
2013-11-22 18:11 ` Ramkumar Ramachandra
2013-11-22 21:01 ` Jens Lehmann
2013-11-22 21:46 ` Sergey Sharybin
2013-11-22 21:54 ` Heiko Voigt
2013-11-22 22:09 ` Jonathan Nieder
2013-11-23 20:10 ` Jens Lehmann
2013-11-24 0:52 ` Heiko Voigt
2013-11-24 16:29 ` Jens Lehmann
2013-11-25 9:02 ` Sergey Sharybin
2013-11-25 17:49 ` Heiko Voigt
2013-11-25 17:57 ` Sergey Sharybin
2013-11-25 18:15 ` Heiko Voigt
2013-12-04 22:16 ` [RFC/WIP PATCH 0/4] less ignorance of submodules for ignore=all Heiko Voigt
2013-12-04 22:19 ` [RFC/WIP PATCH 1/4] disable complete ignorance of submodules for index <-> HEAD diff Heiko Voigt
2013-12-04 22:21 ` [RFC/WIP PATCH 2/4] fix 'git add' to skip submodules configured as ignored Heiko Voigt
2013-12-04 22:21 ` [RFC/WIP PATCH 3/4] teach add -f option for ignored submodules Heiko Voigt
2013-12-06 23:10 ` Junio C Hamano
2013-12-09 21:51 ` Heiko Voigt
2013-12-04 22:23 ` [RFC/WIP PATCH 4/4] always show committed submodules in summary after commit Heiko Voigt
2013-12-04 22:26 ` [RFC/WIP PATCH 0/4] less ignorance of submodules for ignore=all Heiko Voigt
2013-12-04 22:32 ` Junio C Hamano
2013-12-04 23:19 ` Heiko Voigt
2013-12-05 20:51 ` Jens Lehmann
2013-12-09 21:41 ` Heiko Voigt
2013-12-09 22:25 ` Junio C Hamano
2013-11-25 21:01 ` Git issues with submodules Junio C Hamano
2013-11-26 18:44 ` Jens Lehmann
2013-11-26 19:33 ` Junio C Hamano
2013-11-26 19:51 ` Jonathan Nieder
2013-11-26 22:19 ` Junio C Hamano
2013-11-23 1:11 ` [RFC PATCH] disable complete ignorance of submodules for index <-> HEAD diff Heiko Voigt
2013-11-25 9:01 ` Sergey Sharybin
2013-11-28 7:10 ` Heiko Voigt
2013-11-29 23:11 ` [RFC/WIP PATCH v2] " Heiko Voigt
2013-11-23 7:04 ` Re: Git issues with submodules Ramkumar Ramachandra
2013-11-23 20:32 ` Jens Lehmann
2013-11-24 1:06 ` Heiko Voigt
2013-11-25 20:53 ` Junio C Hamano
2013-11-29 22:50 ` Heiko Voigt
2013-11-23 6:53 ` Ramkumar Ramachandra
2013-11-22 16:12 ` Ramkumar Ramachandra
2013-11-22 20:20 ` Jens Lehmann
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='CALkWK0n7jdLKOAFoFjuRz0aTCssorAgk2y=Vce76Y5aHWbj53Q@mail.gmail.com' \
--to=artagnon@gmail.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=sergey.vfx@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).