@matheusbsbs / matheus-bagliano / commits / 4d8ee0317f

push: avoid showing false negotiation errors

When "git push" is configured to use the push negotiation, a push of deletion of a branch (without pushing anything else) may end up not having anything to negotiate for the common ancestor discovery. In such a case, we end up making an internal invocation of "git fetch --negotiate-only" without any "--negotiate-tip" parameters that stops the negotiate-only fetch from being run, which by itself is not a bad thing (one fewer round-trip), but the end-user sees a "fatal: --negotiate-only needs one or more --negotiation-tip=*" message that the user cannot act upon. Teach "git push" to notice the situation and omit performing the negotiate-only fetch to begin with. One fewer process spawned, one fewer "alarming" message given the user. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Jul 2, 2024 at 12:57 UTC 4d8ee0317f01df5b6f3b41ed1bcb3dc6baecd464

2 files changed +21 -2

send-pack.c

+11 -2

@@ -425,17 +425,26 @@ static void get_commons_through_negotiation(const char *url,

425 struct child_process child = CHILD_PROCESS_INIT;

426 const struct ref *ref;

427 int len = the_hash_algo->hexsz + 1; /* hash + NL */

428 + int nr_negotiation_tip = 0;

429

430 child.git_cmd = 1;

431 child.no_stdin = 1;

432 child.out = -1;

433 strvec_pushl(&child.args, "fetch", "--negotiate-only", NULL);

434 for (ref = remote_refs; ref; ref = ref->next) {

434 - if (!is_null_oid(&ref->new_oid))

435 - strvec_pushf(&child.args, "--negotiation-tip=%s", oid_to_hex(&ref->new_oid));

435 + if (!is_null_oid(&ref->new_oid)) {

436 + strvec_pushf(&child.args, "--negotiation-tip=%s",

437 + oid_to_hex(&ref->new_oid));

438 + nr_negotiation_tip++;

439 + }

440 }

441 strvec_push(&child.args, url);

442

443 + if (!nr_negotiation_tip) {

444 + child_process_clear(&child);

445 + return;

446 + }

447 +

448 if (start_command(&child))

449 die(_("send-pack: unable to fork off fetch subprocess"));

450

t/t5516-fetch-push.sh

+10

@@ -230,6 +230,16 @@ test_expect_success 'push with negotiation proceeds anyway even if negotiation f

230 test_grep "push negotiation failed" err

231 '

232

233 +test_expect_success 'push deletion with negotiation' '

234 + mk_empty testrepo &&

235 + git push testrepo $the_first_commit:refs/heads/master &&

236 + git -c push.negotiate=1 push testrepo \

237 + :master $the_first_commit:refs/heads/next 2>errors-2 &&

238 + test_grep ! "negotiate-only needs one or " errors-2 &&

239 + git -c push.negotiate=1 push testrepo :next 2>errors-1 &&

240 + test_grep ! "negotiate-only needs one or " errors-1

241 +'

242 +

243 test_expect_success 'push with negotiation does not attempt to fetch submodules' '

244 mk_empty submodule_upstream &&

245 test_commit -C submodule_upstream submodule_commit &&