@matheusbsbs / matheus-bagliano / commits / 1e5b5ea538

send-pack.c: move "no refs in common" abort earlier

Move the early return if we have no remote refs in send_pack() earlier. When this was added in 4c353e890c0 (Warn when send-pack does nothing, 2005-12-04) one of the first things we'd do was to abort, but as of cfee10a773b (send-pack/receive-pack: allow errors to be reported back to pusher., 2005-12-25) we've added numerous server_supports() conditions that are acted on later in the function, that won't be used if we don't have remote refs. Then as of 477673d6f39 (send-pack: support push negotiation, 2021-05-04) we started doing even more work on the assumption that we had some remote refs to feed to --negotiation-tip=* options. We only hit this condition if we have nothing to push, so we don't need to consider "push.negotiate" etc. only to do nothing with that information. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Jun 30, 2021 at 18:38 UTC 1e5b5ea5386121fd80c7fe1a05c4e3419584f3c2

1 file changed +6 -5

send-pack.c

+6 -5

@@ -486,6 +486,12 @@ int send_pack(struct send_pack_args *args,

486 const char *push_cert_nonce = NULL;

487 struct packet_reader reader;

488

489 + if (!remote_refs) {

490 + fprintf(stderr, "No refs in common and none specified; doing nothing.\n"

491 + "Perhaps you should specify a branch.\n");

492 + return 0;

493 + }

494 +

495 git_config_get_bool("push.negotiate", &push_negotiate);

496 if (push_negotiate)

497 get_commons_through_negotiation(args->url, remote_refs, &commons);

@@ -534,11 +540,6 @@ int send_pack(struct send_pack_args *args,

540 }

541 }

542

537 - if (!remote_refs) {

538 - fprintf(stderr, "No refs in common and none specified; doing nothing.\n"

539 - "Perhaps you should specify a branch.\n");

540 - return 0;

541 - }

543 if (args->atomic && !atomic_supported)

544 die(_("the receiving end does not support --atomic push"));

545