From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 6 Apr 2023 20:38:28 +0000 (-0700)
Subject: Merge branch 'ps/fetch-ref-update-reporting'
X-Git-Tag: v2.41.0-rc0~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9dffbc7f11704bd25e5a36e41e5fe5c5d1f7183;p=thirdparty%2Fgit.git

Merge branch 'ps/fetch-ref-update-reporting'

Clean-up of the code path that reports what "git fetch" did to each
ref.

* ps/fetch-ref-update-reporting:
  fetch: centralize printing of reference updates
  fetch: centralize logic to print remote URL
  fetch: centralize handling of per-reference format
  fetch: pass the full local reference name to `format_display`
  fetch: move output format into `display_state`
  fetch: move reference width calculation into `display_state`
---

e9dffbc7f11704bd25e5a36e41e5fe5c5d1f7183
diff --cc builtin/fetch.c
index 7221e57f35,c202c18fb4..c310d89878
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@@ -1128,15 -1175,10 +1176,11 @@@ static int store_updated_refs(struct di
  	if (!connectivity_checked) {
  		struct check_connected_options opt = CHECK_CONNECTED_INIT;
  
 +		opt.exclude_hidden_refs_section = "fetch";
  		rm = ref_map;
  		if (check_connected(iterate_ref_map, &rm, &opt)) {
- 			rc = error(_("%s did not send all necessary objects\n"), url);
+ 			rc = error(_("%s did not send all necessary objects\n"),
+ 				   display_state->url);
  			goto abort;
  		}
  	}