Merge pull request #509 from raymond-rebbeck/main

After a fetch perform a diff against the remote of the current branch

Author: isc-tleavitt

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
 

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())