From: Junio C Hamano <gitster@pobox.com>
To: Uma Srinivasan <usrinivasan@twitter.com>
Cc: Jacob Keller <jacob.keller@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Jens Lehmann <Jens.Lehmann@web.de>,
Heiko Voigt <hvoigt@hvoigt.net>,
Stefan Beller <sbeller@google.com>
Subject: Re: git submodules implementation question
Date: Tue, 30 Aug 2016 10:53:43 -0700 [thread overview]
Message-ID: <xmqqzinu3zyw.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CAN5XQftCC+TUm2Jx4q3V9oFbXndtFx3H+daoB3TD3eWUs6s54A@mail.gmail.com> (Uma Srinivasan's message of "Tue, 30 Aug 2016 10:40:36 -0700")
Uma Srinivasan <usrinivasan@twitter.com> writes:
> I think the following fix is still needed to is_submodule_modified():
>
> strbuf_addf(&buf, "%s/.git", path);
> git_dir = read_gitfile(buf.buf);
> if (!git_dir) {
> git_dir = buf.buf;
> ==> if (!is_git_directory(git_dir)) {
> ==> die("Corrupted .git dir in submodule %s", path);
> ==> }
> }
If it is so important that git_dir is a valid Git
repository after
git_dir = read_gitfile(buf.buf);
if (!git_dir)
git_dir = buf.buf;
is done to determine what "git_dir" to use, it seems to me that it
does not make much sense to check ONLY dir/.git that is a directory
and leave .git/modules/$name that dir/.git file points at unchecked.
But there is much bigger problem with the above addition, I think.
There also can be a case where dir/ does not even have ".git" in it.
A submodule the user is not interested in will just have an empty
directory there, and immediately after the above three lines I
reproduced above, we have this
if (!is_directory(git_dir)) {
strbuf_release(&buf);
return 0;
}
The added check will break the use case. If anything, that check,
if this code needs to verify that "git_dir" points at a valid Git
repository, should come _after_ that.
Shouldn't "git-status --porcelain" run in the submodule notice that
it is not a valid repository and quickly die anyway? Why should we
even check before spawning that process in the first place?
I might suggest to update prepare_submodule_repo_env() so that the
spawned process will *NOT* have to guess where the working tree and
repository by exporting GIT_DIR (set to "git_dir" we discover above)
and GIT_WORK_TREE (set to "." as cp.dir is set to the path to the
working tree of the submodule). That would stop the "git status" to
guess (and fooled by a corrupted dir/.git that is not a git
repository).
next prev parent reply other threads:[~2016-08-30 17:53 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-28 23:24 git submodules implementation question Uma Srinivasan
2016-08-29 20:03 ` Junio C Hamano
2016-08-29 21:03 ` Uma Srinivasan
2016-08-29 21:09 ` Junio C Hamano
2016-08-29 21:13 ` Uma Srinivasan
2016-08-29 23:04 ` Uma Srinivasan
2016-08-29 23:15 ` Junio C Hamano
2016-08-29 23:34 ` Uma Srinivasan
2016-08-30 0:02 ` Jacob Keller
2016-08-30 0:12 ` Uma Srinivasan
2016-08-30 6:09 ` Jacob Keller
2016-08-30 6:23 ` Jacob Keller
2016-08-30 17:40 ` Uma Srinivasan
2016-08-30 17:53 ` Junio C Hamano [this message]
2016-08-31 2:54 ` Uma Srinivasan
2016-08-31 16:42 ` Junio C Hamano
2016-08-31 18:40 ` Uma Srinivasan
2016-08-31 18:44 ` Junio C Hamano
2016-08-31 18:58 ` Uma Srinivasan
2016-09-01 1:04 ` Uma Srinivasan
2016-09-01 4:09 ` Junio C Hamano
2016-09-01 16:05 ` Uma Srinivasan
2016-09-01 18:32 ` Junio C Hamano
2016-09-01 18:37 ` Stefan Beller
2016-09-01 19:19 ` Junio C Hamano
2016-09-01 19:56 ` Uma Srinivasan
2016-09-01 20:29 ` Junio C Hamano
2016-09-01 20:21 ` Junio C Hamano
2016-09-01 21:02 ` Junio C Hamano
2016-09-01 21:04 ` Stefan Beller
2016-09-01 21:12 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqzinu3zyw.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=hvoigt@hvoigt.net \
--cc=jacob.keller@gmail.com \
--cc=sbeller@google.com \
--cc=usrinivasan@twitter.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).