From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Sven Verdoolaege <skimo@kotnet.org>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Steffen Prohaska <prohaska@zib.de>
Subject: Re: [PATCH] git-apply: apply submodule changes
Date: Fri, 10 Aug 2007 13:39:21 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0708101337510.21857@racer.site> (raw)
In-Reply-To: <20070810093049.GA868MdfPADPa@greensroom.kotnet.org>
Hi,
On Fri, 10 Aug 2007, Sven Verdoolaege wrote:
> @@ -2387,7 +2405,9 @@ static void add_index_file(const char *path, unsigned mode, void *buf, unsigned
> die("unable to stat newly created file %s", path);
> fill_stat_cache_info(ce, &st);
> }
> - if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)
> + if (S_ISGITLINK(mode))
> + get_sha1_hex(buf + strlen("Subproject commit "), ce->sha1);
> + else if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)
> die("unable to create backing store for newly created file %s", path);
> if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
> die("unable to add cache entry for %s", path);
I guess that you need to catch an error from get_sha1_hex(), too.
I hope it is not to much to ask for a patch to t7400 to show what this
patch fixes?
Ciao,
Dscho
next prev parent reply other threads:[~2007-08-10 12:40 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 [this message]
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
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=Pine.LNX.4.64.0708101337510.21857@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=prohaska@zib.de \
--cc=skimo@kotnet.org \
/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).