From: Junio C Hamano <gitster@pobox.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/4] read-cache: fix wrong 'the_index' usage
Date: Mon, 03 Jun 2013 10:09:48 -0700 [thread overview]
Message-ID: <7v4ndfi0ir.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1369922181-31016-2-git-send-email-felipe.contreras@gmail.com> (Felipe Contreras's message of "Thu, 30 May 2013 08:56:18 -0500")
Felipe Contreras <felipe.contreras@gmail.com> writes:
> We are dealing with the 'istate' index, not 'the_index'.
>
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---
Good catch; will apply.
> read-cache.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/read-cache.c b/read-cache.c
> index 04ed561..5253ec5 100644
> --- a/read-cache.c
> +++ b/read-cache.c
> @@ -626,7 +626,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
> if (*ptr == '/') {
> struct cache_entry *foundce;
> ++ptr;
> - foundce = index_name_exists(&the_index, ce->name, ptr - ce->name, ignore_case);
> + foundce = index_name_exists(istate, ce->name, ptr - ce->name, ignore_case);
> if (foundce) {
> memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr);
> startPtr = ptr;
next prev parent reply other threads:[~2013-06-03 17:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-30 13:56 [PATCH 0/4] Trivial patches Felipe Contreras
2013-05-30 13:56 ` [PATCH 1/4] read-cache: fix wrong 'the_index' usage Felipe Contreras
2013-06-03 17:09 ` Junio C Hamano [this message]
2013-05-30 13:56 ` [PATCH 2/4] read-cache: trivial style cleanups Felipe Contreras
2013-05-30 13:56 ` [PATCH 3/4] unpack-trees: trivial cleanup Felipe Contreras
2013-06-03 17:13 ` Junio C Hamano
2013-06-03 20:51 ` Felipe Contreras
2013-05-30 13:56 ` [PATCH 4/4] sha1_file: trivial style cleanup Felipe Contreras
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v4ndfi0ir.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).