From: Sven Verdoolaege <skimo@liacs.nl>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Steffen Prohaska <prohaska@zib.de>,
Johannes.Schindelin@gmx.de
Subject: Re: [PATCH v3] git-apply: apply submodule changes
Date: Mon, 13 Aug 2007 11:37:40 +0200 [thread overview]
Message-ID: <20070813093740.GA4684@liacs.nl> (raw)
In-Reply-To: <7vr6m8imj6.fsf@assigned-by-dhcp.cox.net>
On Sun, Aug 12, 2007 at 12:24:29PM -0700, Junio C Hamano wrote:
> Sven Verdoolaege <skimo@kotnet.org> writes:
>
> >> - what does ce have to do in this codepath? read_old_data()
> >> does not care about what is in the index (in fact, in the
> >> index the entry can be a symlink when the path on the
> >> filesystem is a regular file, and it reads from the regular
> >> file as asked--it does not even look at ce by design).
> >> if you have a regular file there in the current version, ce
> >> would say it is a regular file blob and you would not want
> >> read_gitlink_or_skip() to say "Subproject commit xyz...".
> >
> > Hmmm... the documentation says that if --index is in effect
> > then the file to be patched in the work tree is supposed to be
> > up-to-date.
>
> But that is the job of check_patch(), not this function, isn't it?
Ah... so you want me to check that there has been no type change
to the submodule in check_patch (and then I can use my
read_gitlink_or_skip as is). Is that right?
> >> The type-mismatch case to attempt to apply gitlink patch to a
> >> regular blob is covered much earlier in check_patch(). It
> >> complains if st_mode does not match patch->old_mode; I think you
> >> need to adjust it a bit to:
> >>
> >> - allow gitlink patch to a path that currently has nothing (no
> >> submodule checked out) or a directory that has ".git/"
> >> (i.e. submodule checked out).
> >>
> >> - reject gitlink patch otherwise.
> >
> > Are you talking about the case where --index is specified?
>
> Talking about both cases, and the division of responsibility
> between check_patch() and apply_data().
I'll do that for the --index case, but I really think it doesn't
make sense for the other case. If we're not in a git repo,
then the submodule, which may very well be present, is not
going to be a git repo either.
What could make sense is to enforce that in the --index case,
the submodule directory is either empty or a git repo and
that in the non --index case it is empty.
skimo
next prev parent reply other threads:[~2007-08-13 9:38 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-10 9:30 [PATCH] git-apply: apply submodule changes Sven Verdoolaege
2007-08-10 12:34 ` Johannes Schindelin
2007-08-10 12:39 ` Johannes Schindelin
2007-08-10 13:57 ` [PATCH resend] " Sven Verdoolaege
2007-08-11 5:43 ` Junio C Hamano
2007-08-11 6:45 ` Sven Verdoolaege
2007-08-11 7:00 ` Junio C Hamano
2007-08-12 14:23 ` [PATCH v3] " Sven Verdoolaege
2007-08-12 18:16 ` Junio C Hamano
2007-08-12 18:50 ` Sven Verdoolaege
2007-08-12 19:24 ` Junio C Hamano
2007-08-13 9:37 ` Sven Verdoolaege [this message]
2007-08-13 17:13 ` [PATCH v4] " Sven Verdoolaege
2007-08-13 20:26 ` Junio C Hamano
[not found] ` <7vd4xqeilh.fsf@assigned-by-dhcp.cox.net>
2007-08-14 8:39 ` Sven Verdoolaege
2007-08-14 9:09 ` Junio C Hamano
2007-08-15 17:22 ` [PATCH v6] " Sven Verdoolaege
2007-08-16 0:02 ` Junio C Hamano
2007-08-14 20:00 ` [PATCH v4] " 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=20070813093740.GA4684@liacs.nl \
--to=skimo@liacs.nl \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=prohaska@zib.de \
/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.