From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Patrick Steinhardt <ps@pks.im>, git@vger.kernel.org
Subject: Re: [PATCH] sparse-checkout: use fdopen_lock_file() instead of xfdopen()
Date: Fri, 06 Sep 2024 07:55:09 -0700 [thread overview]
Message-ID: <xmqq1q1wzvaq.fsf@gitster.g> (raw)
In-Reply-To: <20240906011935.GA2616101@coredump.intra.peff.net> (Jeff King's message of "Thu, 5 Sep 2024 21:19:35 -0400")
Jeff King <peff@peff.net> writes:
>> fp = fdopen_lock_file(&lk, "w");
>> if (!fp)
>> - die_errno(_("unable to fdopen %s"), get_lock_file_path(&lk));
>> + die_errno(_("unable to fdopen %s"), sparse_filename);
>>
>> if (core_sparse_checkout_cone)
>> write_cone_to_file(fp, pl);
>> @@ -356,11 +355,13 @@ static int write_patterns_and_update(struct pattern_list *pl)
>> write_patterns_to_file(fp, pl);
>>
>> if (commit_lock_file(&lk))
>> - die_errno(_("unable to write %s"), get_locked_file_path(&lk));
>> + die_errno(_("unable to write %s"), sparse_filename);
>
> Note the difference between "get_lock" and "get_locked" in these two.
> The first will mention the tempfile name, and the second the destination
> filename (and sparse_filename is the latter).
I did consider ... to write %s.%s", sparse_filename, LOCK_SUFFIX)
but then thought that the final name is what is more relevant to the
end user. Yes, while correcting unrelated error, I shouldn't have
tried to improve unrelated end-user experience ;-).
> Will send v2 later tonight. Thanks, Patrick, for noticing the problem in
> the first place.
Yeah, thanks, both.
next prev parent reply other threads:[~2024-09-06 14:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-05 8:27 [PATCH] sparse-checkout: use fdopen_lock_file() instead of xfdopen() Jeff King
2024-09-05 10:54 ` Patrick Steinhardt
2024-09-05 21:16 ` Junio C Hamano
2024-09-05 21:20 ` Junio C Hamano
2024-09-06 1:19 ` Jeff King
2024-09-06 14:55 ` Junio C Hamano [this message]
2024-09-05 15:16 ` Junio C Hamano
2024-09-06 3:45 ` [PATCH v2 0/3] sparse-checkout file handle leak fix Jeff King
2024-09-06 3:47 ` [PATCH v2 1/3] sparse-checkout: consolidate cleanup when writing patterns Jeff King
2024-09-06 3:47 ` [PATCH v2 2/3] sparse-checkout: check commit_lock_file " Jeff King
2024-09-06 3:48 ` [PATCH v2 3/3] sparse-checkout: use fdopen_lock_file() instead of xfdopen() Jeff King
2024-09-06 9:25 ` [PATCH v2 0/3] sparse-checkout file handle leak fix Patrick Steinhardt
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=xmqq1q1wzvaq.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=ps@pks.im \
/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.