From: Junio C Hamano <gitster@pobox.com>
To: skimo@liacs.nl
Cc: git@vger.kernel.org, Steffen Prohaska <prohaska@zib.de>,
Johannes.Schindelin@gmx.de
Subject: Re: [PATCH resend] git-apply: apply submodule changes
Date: Fri, 10 Aug 2007 22:43:42 -0700 [thread overview]
Message-ID: <7vd4xupqwh.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20070810135744.GA29243MdfPADPa@greensroom.kotnet.org> (Sven Verdoolaege's message of "Fri, 10 Aug 2007 15:57:44 +0200")
Sven Verdoolaege <skimo@kotnet.org> writes:
> @@ -1994,20 +2014,18 @@ static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *
> alloc = 0;
> buf = NULL;
> if (cached) {
> - if (ce) {
> - enum object_type type;
> - buf = read_sha1_file(ce->sha1, &type, &size);
> - if (!buf)
> - return error("read of %s failed",
> - patch->old_name);
> - alloc = size;
> - }
> + if (read_file_or_gitlink(ce, &buf, &size))
> + return error("read of %s failed", patch->old_name);
> + alloc = size;
> }
> 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?
next prev parent reply other threads:[~2007-08-11 5:43 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 [this message]
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
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=7vd4xupqwh.fsf@assigned-by-dhcp.cox.net \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=prohaska@zib.de \
--cc=skimo@liacs.nl \
/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).