diff options
| author | Sam Bostock <sam@sambostock.ca> | 2026-02-06 19:16:22 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-06 11:45:31 -0800 |
| commit | ba447e9cec47ca5b1cc8cfeae8ca90bc962c54fa (patch) | |
| tree | 17b8cc1402cff42bfd50f030250e5baa5510b1c1 /contrib/persistent-https | |
| parent | 67ad42147a7acc2af6074753ebd03d904476118f (diff) | |
| download | git-ba447e9cec47ca5b1cc8cfeae8ca90bc962c54fa.tar.gz git-ba447e9cec47ca5b1cc8cfeae8ca90bc962c54fa.zip | |
merge-ours: drop USE_THE_REPOSITORY_VARIABLE
The merge-ours built-in uses the `the_repository` global to access
the repository. The project is moving away from this global in favor
of the `repo` parameter that is passed to each built-in command.
Since merge-ours is registered with RUN_SETUP, `repo` is guaranteed
to be non-NULL and can be used directly.
Drop the USE_THE_REPOSITORY_VARIABLE macro and use `repo` throughout.
While at it, remove a stray double blank line between the #include
block and the usage string.
Signed-off-by: Sam Bostock <sam@sambostock.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/persistent-https')
0 files changed, 0 insertions, 0 deletions