All of lore.kernel.org
 help / color / mirror / Atom feed
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 resend] git-apply: apply submodule changes
Date: Sat, 11 Aug 2007 08:45:55 +0200	[thread overview]
Message-ID: <20070811064555.GC29996@liacs.nl> (raw)
In-Reply-To: <7vd4xupqwh.fsf@assigned-by-dhcp.cox.net>

On Fri, Aug 10, 2007 at 10:43:42PM -0700, Junio C Hamano wrote:
> Sven Verdoolaege <skimo@kotnet.org> writes:
> >  	else if (patch->old_name) {
> >  		size = xsize_t(st->st_size);
> >  		alloc = size + 8192;
> >  		buf = xmalloc(alloc);
> > -		if (read_old_data(st, patch->old_name, &buf, &alloc, &size))
> > +		if (S_ISGITLINK(patch->old_mode))
> > +			size = snprintf(buf, alloc,
> > +				"Subproject commit %s\n", sha1_to_hex(ce->sha1));
> > +		else if (read_old_data(st, patch->old_name, &buf, &alloc, &size))
> 
> Who guarantees that ce is given to apply_data() in this codepath?

Oops.  I guess it shows that I only tested it through git-rebase.
Would changing

		if (check_index) {

on line 2093 to

		if (check_index || S_ISGITLINK(patch->old_mode)) {

be acceptable?  Adding a conditional call to read_cache(), of course.
We're not going to be able to apply submodule patches without
an index, anyway.
Or should we just refuse to apply submodule patches if --index
has not been specified?

skimo

  reply	other threads:[~2007-08-11  6:46 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 [this message]
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
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=20070811064555.GC29996@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.