@matheusbsbs / matheus-bagliano / commits / 64f0f6b88a

promisor-remote: refactor should_accept_remote() control flow

A previous commit made sure we now reject empty URLs early at parse time. This makes the existing warning() in case a remote URL is NULL or empty very unlikely to be useful. In future work, we also plan to add URL-based acceptance logic into should_accept_remote(). To adapt to previous changes and prepare for upcoming changes, let's restructure the control flow in should_accept_remote(). Concretely, let's: - Replace the warning() in case of an empty URL with a BUG(), as a previous commit made sure empty URLs are rejected early at parse time. - Move that modified empty-URL check to the very top of the function, so that every acceptance mode, instead of only ACCEPT_KNOWN_URL, is covered. - Invert the URL comparison: instead of returning on match and warning on mismatch, return early on mismatch and let the match case fall through. This opens a single exit path at the bottom of the function for future commits to extend. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Christian Couder committed Apr 7, 2026 at 13:52 UTC 64f0f6b88aea33546afd1271862b486fafe7e9cc

1 file changed +10 -10

promisor-remote.c

+10 -10

@@ -651,6 +651,11 @@ static int should_accept_remote(enum accept_promisor accept,

651 const char *remote_name = advertised->name;

652 const char *remote_url = advertised->url;

653

654 + if (!remote_url || !*remote_url)

655 + BUG("no or empty URL advertised for remote '%s'; "

656 + "this remote should have been rejected earlier",

657 + remote_name);

658 +

659 if (accept == ACCEPT_ALL)

660 return all_fields_match(advertised, config_info, NULL);

661

@@ -669,19 +674,14 @@ static int should_accept_remote(enum accept_promisor accept,

674 if (accept != ACCEPT_KNOWN_URL)

675 BUG("Unhandled 'enum accept_promisor' value '%d'", accept);

676

672 - if (!remote_url || !*remote_url) {

673 - warning(_("no or empty URL advertised for remote '%s', "

674 - "ignoring this remote"), remote_name);

677 + if (strcmp(p->url, remote_url)) {

678 + warning(_("known remote named '%s' but with URL '%s' instead of '%s', "

679 + "ignoring this remote"),

680 + remote_name, p->url, remote_url);

681 return 0;

682 }

683

678 - if (!strcmp(p->url, remote_url))

679 - return all_fields_match(advertised, config_info, p);

680 -

681 - warning(_("known remote named '%s' but with URL '%s' instead of '%s', "

682 - "ignoring this remote"), remote_name, p->url, remote_url);

683 -

684 - return 0;

684 + return all_fields_match(advertised, config_info, p);

685 }

686

687 static int skip_field_name_prefix(const char *elem, const char *field_name, const char **value)