From: Junio C Hamano <gitster@pobox.com>
To: Patrick Steinhardt <ps@pks.im>
Cc: Sam Bostock via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Sam Bostock <sam@sambostock.ca>
Subject: Re: [PATCH 1/2] merge-ours: drop USE_THE_REPOSITORY_VARIABLE
Date: Fri, 06 Feb 2026 09:33:03 -0800 [thread overview]
Message-ID: <xmqqy0l5g4kw.fsf@gitster.g> (raw)
In-Reply-To: <aYYCesJsZMdHu1Ia@pks.im> (Patrick Steinhardt's message of "Fri, 6 Feb 2026 16:02:18 +0100")
Patrick Steinhardt <ps@pks.im> writes:
>> - struct repository *repo UNUSED)
>> + struct repository *repo)
>> {
>> show_usage_if_asked(argc, argv, builtin_merge_ours_usage);
>
> One important part of the puzzle here is that git-merge-ours(1) cannot
> run outside of a repository, as it is tagged with `RUN_SETUP`. So as a
> consequence, `repo` will never be `NULL`, and thus all the changes to
> s/the_repository/repo/ are safe.
Indeed. It may be worth recording that reasoning in the log
message.
next prev parent reply other threads:[~2026-02-06 17:33 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-06 2:32 [PATCH 0/2] merge-ours: sparse-index integration Sam Bostock via GitGitGadget
2026-02-06 2:32 ` [PATCH 1/2] merge-ours: drop USE_THE_REPOSITORY_VARIABLE Sam Bostock via GitGitGadget
2026-02-06 15:02 ` Patrick Steinhardt
2026-02-06 17:33 ` Junio C Hamano [this message]
2026-02-06 2:32 ` [PATCH 2/2] merge-ours: integrate with sparse-index Sam Bostock via GitGitGadget
2026-02-06 13:35 ` Junio C Hamano
2026-02-06 19:16 ` [PATCH v2 0/2] merge-ours: sparse-index integration Sam Bostock via GitGitGadget
2026-02-06 19:16 ` [PATCH v2 1/2] merge-ours: drop USE_THE_REPOSITORY_VARIABLE Sam Bostock via GitGitGadget
2026-02-06 19:16 ` [PATCH v2 2/2] merge-ours: integrate with sparse-index Sam Bostock via GitGitGadget
2026-02-09 15:05 ` [PATCH v2 0/2] merge-ours: sparse-index integration Patrick Steinhardt
2026-02-10 4:35 ` Derrick Stolee
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=xmqqy0l5g4kw.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=ps@pks.im \
--cc=sam@sambostock.ca \
/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.