From: Junio C Hamano <gitster@pobox.com>
To: Ramsay Jones <ramsay@ramsayjones.plus.com>
Cc: GIT Mailing-list <git@vger.kernel.org>
Subject: Re: 'seen' branch fails to build
Date: Sat, 09 Aug 2025 17:16:09 -0700 [thread overview]
Message-ID: <xmqq5xew58vq.fsf@gitster.g> (raw)
In-Reply-To: <92c8c9eb-91de-48c6-88ac-7d5583cc766a@ramsayjones.plus.com> (Ramsay Jones's message of "Sat, 9 Aug 2025 14:34:29 +0100")
Ramsay Jones <ramsay@ramsayjones.plus.com> writes:
> See commit 456a265746 ("diff: --no-index should ignore the worktree",
> 2025-08-07) in the 'jc/diff-no-index-in-subdir' branch.
>
> In order to get it to build, I just did:
> ...
Thanks for noticing and reporting. I'd save the translators by
reusing the message used already elsewhere.
builtin/diff.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git c/builtin/diff.c w/builtin/diff.c
index 3eb4cbb057..0b23c41456 100644
--- c/builtin/diff.c
+++ w/builtin/diff.c
@@ -497,7 +497,8 @@ int cmd_diff(int argc,
* prefix.
*/
if (no_index && prefix) {
- chdir(prefix);
+ if (chdir(prefix))
+ die(_("cannot come back to cwd"));
prefix = NULL;
}
prev parent reply other threads:[~2025-08-10 0:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-09 13:34 'seen' branch fails to build Ramsay Jones
2025-08-10 0:16 ` Junio C Hamano [this message]
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=xmqq5xew58vq.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=ramsay@ramsayjones.plus.com \
/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).