From: Uma Srinivasan <usrinivasan@twitter.com>
To: Jacob Keller <jacob.keller@gmail.com>
Cc: Junio C Hamano <gitster@pobox.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:40:36 -0700 [thread overview]
Message-ID: <CAN5XQftCC+TUm2Jx4q3V9oFbXndtFx3H+daoB3TD3eWUs6s54A@mail.gmail.com> (raw)
In-Reply-To: <CA+P7+xpGnsKzBPLVgPNSmZ7K00vY7-eJp7kSHWMRHM+cOsL_XQ@mail.gmail.com>
Thanks for the patch. Unfortunately, it doesn't help in my case as it
invokes the is_submodule_modified() routine which you didn't modify.
Here's my call trace....
#0 is_submodule_modified (path=path@entry=0x17c2f08 "groc", ignore_untracked=0)
at submodule.c:939
#1 0x00000000004aa4dc in match_stat_with_submodule (
diffopt=diffopt@entry=0x7fffffffde18, ce=ce@entry=0x17c2eb0,
st=st@entry=0x7fffffffd840, ce_option=ce_option@entry=0,
dirty_submodule=dirty_submodule@entry=0x7fffffffd83c) at diff-lib.c:81
#2 0x00000000004ab4f5 in run_diff_files (revs=revs@entry=0x7fffffffd920,
option=option@entry=0) at diff-lib.c:217
#3 0x000000000054c0d4 in wt_status_collect_changes_worktree
(s=s@entry=0x7de280 <s>)
at wt-status.c:559
#4 0x000000000054ecf6 in wt_status_collect (s=s@entry=0x7de280 <s>)
at wt-status.c:678
#5 0x0000000000422171 in cmd_status (argc=<optimized out>,
argv=<optimized out>,
prefix=0x0) at builtin/commit.c:1390
#6 0x0000000000405abe in run_builtin (argv=<optimized out>,
argc=<optimized out>,
p=<optimized out>) at git.c:352
#7 handle_builtin (argc=1, argv=0x7fffffffe570) at git.c:551
#8 0x0000000000405dd8 in run_argv (argv=0x7fffffffe320, argcp=0x7fffffffe32c)
at git.c:606
#9 cmd_main (argc=1, argc@entry=2, argv=0x7fffffffe570,
argv@entry=0x7fffffffe568)
at git.c:678
#10 0x0000000000405060 in main (argc=2, argv=0x7fffffffe568) at common-main.c:40
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);
==> }
}
Thanks,
Uma
On Mon, Aug 29, 2016 at 11:23 PM, Jacob Keller <jacob.keller@gmail.com> wrote:
> On Mon, Aug 29, 2016 at 11:09 PM, Jacob Keller <jacob.keller@gmail.com> wrote:
>> On Mon, Aug 29, 2016 at 5:12 PM, Uma Srinivasan <usrinivasan@twitter.com> wrote:
>>> This is great! Thanks Jake. If you happen to have the patch ID it
>>> would be helpful.
>>>
>>> Uma
>>>
>>
>> http://public-inbox.org/git/1472236108.28343.5.camel@intel.com/
>
>
> Actually correct patch is
> http://public-inbox.org/git/20160825233243.30700-6-jacob.e.keller@intel.com/
>
> Thanks,
> Jake
next prev parent reply other threads:[~2016-08-30 17:40 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 [this message]
2016-08-30 17:53 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAN5XQftCC+TUm2Jx4q3V9oFbXndtFx3H+daoB3TD3eWUs6s54A@mail.gmail.com \
--to=usrinivasan@twitter.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=jacob.keller@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.