From: Junio C Hamano <gitster@pobox.com>
To: Matheus Tavares <matheus.bernardino@usp.br>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] write_entry(): fix misuses of `path` in error messages
Date: Tue, 09 Feb 2021 13:27:19 -0800 [thread overview]
Message-ID: <xmqqr1lpyls8.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <d52bcad326ece6be2fcf87ca6b72e4ce8212e31f.1612812581.git.matheus.bernardino@usp.br> (Matheus Tavares's message of "Mon, 8 Feb 2021 16:36:31 -0300")
Matheus Tavares <matheus.bernardino@usp.br> writes:
> The variables `path` and `ce->name`, at write_entry(), usually have the
> same contents, but that's not the case when using a checkout prefix or
> writing to a tempfile. (In fact, `path` will be either empty or dirty
> when writing to a tempfile.) Therefore, these variables cannot be used
> interchangeably. In this sense, fix wrong uses of `path` in error
> messages where it should really be `ce->name`. (There doesn't seem to be
> any misuse in the other way around.)
Sounds reasonable. Don't we want to protect this fix with tests?
> Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
> ---
> entry.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/entry.c b/entry.c
> index a0532f1f00..7b9f43716f 100644
> --- a/entry.c
> +++ b/entry.c
> @@ -282,7 +282,7 @@ static int write_entry(struct cache_entry *ce,
> new_blob = read_blob_entry(ce, &size);
> if (!new_blob)
> return error("unable to read sha1 file of %s (%s)",
> - path, oid_to_hex(&ce->oid));
> + ce->name, oid_to_hex(&ce->oid));
>
> /*
> * We can't make a real symlink; write out a regular file entry
> @@ -309,7 +309,7 @@ static int write_entry(struct cache_entry *ce,
> new_blob = read_blob_entry(ce, &size);
> if (!new_blob)
> return error("unable to read sha1 file of %s (%s)",
> - path, oid_to_hex(&ce->oid));
> + ce->name, oid_to_hex(&ce->oid));
> }
>
> /*
> @@ -354,7 +354,7 @@ static int write_entry(struct cache_entry *ce,
>
> case S_IFGITLINK:
> if (to_tempfile)
> - return error("cannot create temporary submodule %s", path);
> + return error("cannot create temporary submodule %s", ce->name);
> if (mkdir(path, 0777) < 0)
> return error("cannot create submodule directory %s", path);
> sub = submodule_from_ce(ce);
> @@ -365,7 +365,7 @@ static int write_entry(struct cache_entry *ce,
> break;
>
> default:
> - return error("unknown file mode for %s in index", path);
> + return error("unknown file mode for %s in index", ce->name);
> }
>
> finish:
next prev parent reply other threads:[~2021-02-09 23:13 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 19:36 [PATCH 0/2] checkout-index: some cleanups to --temp and --prefix outputs Matheus Tavares
2021-02-08 19:36 ` [PATCH 1/2] write_entry(): fix misuses of `path` in error messages Matheus Tavares
2021-02-09 21:27 ` Junio C Hamano [this message]
2021-02-09 23:59 ` Matheus Tavares Bernardino
2021-02-08 19:36 ` [PATCH 2/2] checkout-index: omit entries with no tempname from --temp output Matheus Tavares
2021-02-09 21:35 ` Junio C Hamano
2021-02-09 21:57 ` Matheus Tavares Bernardino
2021-02-10 1:07 ` Junio C Hamano
2021-02-15 18:24 ` [PATCH v2 0/2] checkout-index: some cleanups to --temp and --prefix outputs Matheus Tavares
2021-02-15 18:24 ` [PATCH v2 1/2] write_entry(): fix misuses of `path` in error messages Matheus Tavares
2021-02-16 2:26 ` Junio C Hamano
2021-02-15 18:24 ` [PATCH v2 2/2] checkout-index: omit entries with no tempname from --temp output Matheus Tavares
2021-02-16 14:06 ` [PATCH v3 0/2] checkout-index: some cleanups to --temp and --prefix outputs Matheus Tavares
2021-02-16 14:06 ` [PATCH v3 1/2] write_entry(): fix misuses of `path` in error messages Matheus Tavares
2021-02-16 14:06 ` [PATCH v3 2/2] checkout-index: omit entries with no tempname from --temp output Matheus Tavares
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=xmqqr1lpyls8.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=matheus.bernardino@usp.br \
/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).