From nobody Fri Jul 24 21:11:24 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4h6LJY0wDSz6mkhR for ; Fri, 24 Jul 2026 21:11:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h6LJX65s9z3fT5 for ; Fri, 24 Jul 2026 21:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784927484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3zOOyXZmN/anzt4GPXRI4lE8x9bYhFsTt51/krR48UI=; b=kh75+lAwBf/W1ej67fcRsl4VUEELe9BO8r0P/JNa2llB8G5U8vVGvaJfXmZcrUzT4j8C2J OEL4YGZWJEIrYgVnZTPT6dHh2m4PU1GsX0LXZHG3tE3onRLe+2JgkAPvS9SGNKCpqay+Ni n19TvZBYhu/+aUYuUBkPDTNrnJ7JE8R16zXgaMO0SNFaF4KiBOdnu/YvKq/vZpZefHGMS4 b89zaGQf/mvXiL5YRFUeWHLLEWa8PiYzcQGkKJGpwPsWL83QkMIalFPMSsAFum3FSE/OeV SX7g+fSQci/l6lXl7K4voRmd8j/hlnX0/XJ27pRYkLcrhE+AUqWl3yEQLvx8Bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784927484; a=rsa-sha256; cv=none; b=izNhn3SUsufeBYr8fbjnyXuv9AL154AcIEGqql9TVbXRcXZ2qpw+v973wu089E8kKF3OIo Rjgp6wJu9FkdZMFBvKD9DEd7wYANGkavHO5BHo1yd92FbsF6rjX28OlzIZ7DsG4jsBwhFX YnNVMjJ48a+gKYIKNB5JVklD0SahsX23owRtt+zN9jG/MAj+/7uXkrMK3c9QBH0Bd5tevk u/hFXnXod9h5/qrCPUMz6gp/JyF4c8WCKGS9t5UJM+vtAFxmRIa+8uVYr7qhIZTZRB1iOJ oos0q5hhqcVxCNdHwX3k+RRcc4MKz5vWoFnelwDDU+951IANJK1U0d2aQeqibg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784927484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3zOOyXZmN/anzt4GPXRI4lE8x9bYhFsTt51/krR48UI=; b=xjHcgwzEg99cSLAcr5f8R9m8Ea9kSxQhGM3Bvqxkt6Jk9EGLR8ZqbW4yyX1/RxwjGLtTtS m6ZVjmhWXmLwk0/tziDNn6YY7hALGovOd4q4tjm1z8z+gET7TKkoIm2iFPWsZF1B6XjdyH hJCA3k/Xd8ilrlUslpGjBEN9h/8A7/brWFL+D4nK7FXZhIsXdtL9zGeDGPInCwW3pFhWsT T0/lhQTdL8KVLeEEKXYuSGtXDA1FVpvhNAMP3IRGBHR3Gmj14a84ljG0DO4zi9uR863MqU fiIApvcmcoolO7vDOVKSIqhZDX8Kz3tLb4Wn7UmkTZiCz+WzT7ebq8HKPVY/qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6LJX4v4gz17Cj for ; Fri, 24 Jul 2026 21:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38e45 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Jul 2026 21:11:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b86e36493469 - main - git-mfc: Improve handling of remotes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b86e36493469ded108ad616ebc094886b33851c4 Auto-Submitted: auto-generated Date: Fri, 24 Jul 2026 21:11:24 +0000 Message-Id: <6a63d4fc.38e45.3181dfca@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b86e36493469ded108ad616ebc094886b33851c4 commit b86e36493469ded108ad616ebc094886b33851c4 Author: Mark Johnston AuthorDate: 2026-07-24 21:10:26 +0000 Commit: Mark Johnston CommitDate: 2026-07-24 21:10:26 +0000 git-mfc: Improve handling of remotes If we can't figure out which remote to use, print a useful error instead of assuming that "freebsd" is the right remote to use. --- tools/tools/git/git-mfc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/tools/git/git-mfc b/tools/tools/git/git-mfc index 431ed2ebc861..c6c4ea2b786a 100755 --- a/tools/tools/git/git-mfc +++ b/tools/tools/git/git-mfc @@ -501,11 +501,11 @@ def main(): if args.remote: remote = args.remote else: - try: - tracking = repo.active_branch.tracking_branch() - remote = tracking.remote_name if tracking else 'freebsd' - except (TypeError, ValueError): - remote = 'freebsd' + tracking = repo.active_branch.tracking_branch() + if tracking: + remote = tracking.remote_name + else: + err(1, "could not find upstream branch, use --remote") upstream = remote + '/' + origin