From 9320d883a4a552eb74e56ed64a468cc07cf264eb Mon Sep 17 00:00:00 2001 From: Raymond Rebbeck Date: Sun, 5 Oct 2025 22:21:02 +1030 Subject: [PATCH 1/2] Always set the remote as the upstream branch when pushing, for consistency with Web UI --- cls/SourceControl/Git/Utils.cls | 1 + 1 file changed, 1 insertion(+) diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls index 869232e0..605a977b 100644 --- a/cls/SourceControl/Git/Utils.cls +++ b/cls/SourceControl/Git/Utils.cls @@ -616,6 +616,7 @@ ClassMethod Push(remote As %String = "origin", force As %Boolean = 0) As %Status if (force) { set args($i(args)) = "--force" } + set args($i(args)) = "--set-upstream" set args($i(args)) = remote set args($i(args)) = branchName do ..RunGitWithArgs(.errStream, .outStream, "push", args...) From e24cfc5b457f30ad3aeb19e2c58fbb1495ae7028 Mon Sep 17 00:00:00 2001 From: Raymond Rebbeck Date: Sun, 5 Oct 2025 22:39:00 +1030 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85abb2a6..5150e34a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - When cloning a repo with Configure, that repo's embedded-git-config file will overwrite previous settings (#819) - Settings page no longer removes remote when saving after cloning (#858) +- Always set the remote as the upstream branch when pushing (#871) ## [2.13.1] - 2025-09-16