From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Apr 2022 17:56:23 +0000 (-0700)
Subject: Merge branch 'tk/ambiguous-fetch-refspec'
X-Git-Tag: v2.36.0-rc0~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba2452b247dfd455bccbcb04acdcfd142cb5397e;p=thirdparty%2Fgit.git

Merge branch 'tk/ambiguous-fetch-refspec'

Give hint when branch tracking cannot be established because fetch
refspecs from multiple remote repositories overlap.

* tk/ambiguous-fetch-refspec:
  tracking branches: add advice to ambiguous refspec error
---

ba2452b247dfd455bccbcb04acdcfd142cb5397e
diff --cc branch.c
index 581afd634d,182f1c5a55..01ecb816d5
--- a/branch.c
+++ b/branch.c
@@@ -232,10 -246,11 +246,14 @@@ static void setup_tracking(const char *
  	struct tracking tracking;
  	struct string_list tracking_srcs = STRING_LIST_INIT_DUP;
  	int config_flags = quiet ? 0 : BRANCH_CONFIG_VERBOSE;
+ 	struct find_tracked_branch_cb ftb_cb = {
+ 		.tracking = &tracking,
+ 		.ambiguous_remotes = STRING_LIST_INIT_DUP,
+ 	};
  
 +	if (!track)
 +		BUG("asked to set up tracking, but tracking is disallowed");
 +
  	memset(&tracking, 0, sizeof(tracking));
  	tracking.spec.dst = (char *)orig_ref;
  	tracking.srcs = &tracking_srcs;