From ecbdf16ed36ab06fa12ac88219b0409b5512418e Mon Sep 17 00:00:00 2001 From: Raymond Rebbeck Date: Wed, 2 Oct 2024 17:13:14 +0930 Subject: [PATCH 1/2] After a fetch perform a diff against the remote of the current branch --- cls/SourceControl/Git/Utils.cls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls index 94d85304..5a108bc9 100644 --- a/cls/SourceControl/Git/Utils.cls +++ b/cls/SourceControl/Git/Utils.cls @@ -534,7 +534,7 @@ ClassMethod Fetch(ByRef diffFiles) As %Status do ..RunGitCommand("fetch", .errStream, .outStream) write !, "Fetch done" kill errStream, outStream - do ..RunGitCommand("diff", .errStream, .outStream, "..origin", "--name-only") + do ..RunGitCommand("diff", .errStream, .outStream, "..origin/"_..GetCurrentBranch(), "--name-only") set diffFiles = "" while (outStream.AtEnd = 0) { set diffFiles = diffFiles_$listbuild(outStream.ReadLine()) From c5ac5e526d6e7bda0fd7b0a3ecb9afbf7a4762b7 Mon Sep 17 00:00:00 2001 From: isc-tleavitt <73311181+isc-tleavitt@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:28:44 -0400 Subject: [PATCH 2/2] chore: update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dbcaa0a..85bead8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added warnings when user is using incompatible git version (#488) - Fixed the back button navigation between WebUI and Settings page (#361) - Basic mode Sync operation now imports items changed on the remote merge branch (#506) +- Fetch diff output uses correct remote branch (#509) ## [2.5.0] - 2024-09-24