Release v2026.17-sk

.gitignore

@@ -6,6 +6,7 @@
 *.user
 *.suo
 *.code-workspace
+*.tss
 
 .DS_Store
 .DocumentRevisions-V100

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Fork releases of SourceGit-SK. Upstream changes arrive through upstream release merges and are documented in the [upstream release notes](https://github.com/sourcegit-scm/sourcegit/releases).
 
+## [2026.17-sk] - 2026-07-24
+
+### Changed
+
+- Merged upstream [v2026.15](https://github.com/sourcegit-scm/sourcegit/releases/tag/v2026.15) into the fork, bringing upstream's fixes and improvements while keeping all fork customizations ([#9](https://github.com/skoonin/sourcegit-sk/pull/9))
+
 ## [2026.16-sk] - 2026-07-12
 
 ### Added
@@ -32,5 +38,6 @@ First fork release, based on upstream [v2026.14](https://github.com/sourcegit-sc
 - Version numbers carry an `-sk` suffix (shown in the About dialog) to distinguish fork releases from upstream builds.
 - The update check and release links point at this fork's releases instead of upstream's, so new `-sk` releases are detected and offered ([#2](https://github.com/skoonin/sourcegit-sk/pull/2))
 
+[2026.17-sk]: https://github.com/skoonin/sourcegit-sk/releases/tag/v2026.17-sk
 [2026.16-sk]: https://github.com/skoonin/sourcegit-sk/releases/tag/v2026.16-sk
 [2026.15-sk]: https://github.com/skoonin/sourcegit-sk/releases/tag/v2026.15-sk

Makefile

@@ -2,6 +2,10 @@
 # GitHub Actions are disabled in this repository; `make check` is the local CI gate.
 
 DOTNET ?= $(shell command -v dotnet 2>/dev/null || echo $(HOME)/.local/share/dotnet/dotnet)
+# Avalonia's build-time stats task writes to ~/Library/Application Support/AvaloniaUI;
+# that write fails in restricted/sandboxed environments and breaks the build. Opt out to
+# keep builds hermetic. Only affects build telemetry, not the app.
+export AVALONIA_TELEMETRY_OPTOUT := true
 # Lazy so only the app target shells out for the version.
 VERSION = $(shell cat VERSION)
 RUNTIME ?= osx-arm64

README.md

@@ -6,6 +6,16 @@
 [![latest](https://img.shields.io/github/v/release/sourcegit-scm/sourcegit.svg)](https://github.com/sourcegit-scm/sourcegit/releases/latest)
 [![downloads](https://img.shields.io/github/downloads/sourcegit-scm/sourcegit/total)](https://github.com/sourcegit-scm/sourcegit/releases)
 
+## Fork customizations (SourceGit-SK)
+
+This is a personal fork of [sourcegit-scm/sourcegit](https://github.com/sourcegit-scm/sourcegit) that tracks upstream and adds the changes below. These are specific to this fork and are not part of upstream SourceGit. See [CHANGELOG.md](CHANGELOG.md) for the full history.
+
+* **Stacked multi-file diff** across every change view (working copy, commit details, compare, revision compare, submodule compare, stashes): with no file selected the whole change set shows as one scrollable diff; selecting several files stacks those; selecting one shows a single file. Includes a shared toolbar, file navigation, and per-file context controls.
+* **Recent-commits block in the repository sidebar**, showing the full commit graph.
+* **Bracket tab switching**: Cmd+Shift+[ / Cmd+Shift+] on macOS (Ctrl+Shift on Windows/Linux) moves between tabs; the existing bindings still work.
+* **"Open Another Repository..."** entry in the repository switcher (Ctrl/Cmd+P) opens a folder picker for a repo not yet in the list.
+* **Fork versioning**: releases carry an `-sk` suffix (shown in the About dialog), and the update check points at this fork's releases instead of upstream's.
+
 ## Screenshots
 
 * Dark Theme

TRANSLATION.md

@@ -125,79 +125,37 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![el__GR](https://img.shields.io/badge/el__GR-96.20%25-yellow)
+### ![el__GR](https://img.shields.io/badge/el__GR-99.12%25-yellow)
 
 <details>
 <summary>Missing keys in el_GR.axaml</summary>
 
-- Text.Apply.Source
-- Text.Apply.Source.File
-- Text.Apply.Source.Clipboard
-- Text.Bisect.WaitingForCheckoutAnother
-- Text.Bisect.WaitingForFirstBad
-- Text.CheckoutDetached
-- Text.CheckoutDetached.Target
-- Text.CheckoutDetached.Warning
-- Text.Configure.Git.EnableRecursiveWhenAutoUpdatingSubmodules
-- Text.CopyAsPatch
-- Text.DeleteBranch.AskForRemote
-- Text.DeleteBranch.Force
 - Text.Diff.AndMoreFiles
-- Text.Diff.EmptyFile
 - Text.Diff.FilesCount
 - Text.Diff.FirstFile
 - Text.Diff.LargeDiffHint
 - Text.Diff.LastFile
 - Text.Diff.NextFile
 - Text.Diff.PrevFile
-- Text.FileModeChange
-- Text.FileModeChange.Deleted
-- Text.FileModeChange.Directory
-- Text.FileModeChange.Executable
-- Text.FileModeChange.New
-- Text.FileModeChange.Normal
-- Text.FileModeChange.Submodule
-- Text.FileModeChange.Symlink
-- Text.FileModeChange.Unknown
-- Text.GitFlow.Finish
-- Text.GitFlow.FinishWithRebase
-- Text.GitFlow.StartAt
-- Text.GitFlow.StartName
 - Text.Launcher.OpenOtherRepository
 - Text.Repository.Commits
-- Text.TagCM.Checkout
-- Text.TagCM.Merge
-- Text.UpdateSubmodules.Recursive
-- Text.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-97.96%25-yellow)
+### ![es__ES](https://img.shields.io/badge/es__ES-99.12%25-yellow)
 
 <details>
 <summary>Missing keys in es_ES.axaml</summary>
 
-- Text.DeleteBranch.AskForRemote
-- Text.DeleteBranch.Force
 - Text.Diff.AndMoreFiles
 - Text.Diff.FilesCount
 - Text.Diff.FirstFile
 - Text.Diff.LargeDiffHint
 - Text.Diff.LastFile
 - Text.Diff.NextFile
 - Text.Diff.PrevFile
-- Text.FileModeChange
-- Text.FileModeChange.Deleted
-- Text.FileModeChange.Directory
-- Text.FileModeChange.Executable
-- Text.FileModeChange.New
-- Text.FileModeChange.Normal
-- Text.FileModeChange.Submodule
-- Text.FileModeChange.Symlink
-- Text.FileModeChange.Unknown
 - Text.Launcher.OpenOtherRepository
 - Text.Repository.Commits
-- Text.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder
 
 </details>
 
@@ -1086,32 +1044,20 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-97.96%25-yellow)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.12%25-yellow)
 
 <details>
 <summary>Missing keys in ru_RU.axaml</summary>
 
-- Text.DeleteBranch.AskForRemote
-- Text.DeleteBranch.Force
 - Text.Diff.AndMoreFiles
 - Text.Diff.FilesCount
 - Text.Diff.FirstFile
 - Text.Diff.LargeDiffHint
 - Text.Diff.LastFile
 - Text.Diff.NextFile
 - Text.Diff.PrevFile
-- Text.FileModeChange
-- Text.FileModeChange.Deleted
-- Text.FileModeChange.Directory
-- Text.FileModeChange.Executable
-- Text.FileModeChange.New
-- Text.FileModeChange.Normal
-- Text.FileModeChange.Submodule
-- Text.FileModeChange.Symlink
-- Text.FileModeChange.Unknown
 - Text.Launcher.OpenOtherRepository
 - Text.Repository.Commits
-- Text.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder
 
 </details>
 
@@ -1857,12 +1803,11 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![zh__CN](https://img.shields.io/badge/zh__CN-99.03%25-yellow)
+### ![zh__CN](https://img.shields.io/badge/zh__CN-99.12%25-yellow)
 
 <details>
 <summary>Missing keys in zh_CN.axaml</summary>
 
-- Text.DeleteBranch.AskForRemote
 - Text.Diff.AndMoreFiles
 - Text.Diff.FilesCount
 - Text.Diff.FirstFile
@@ -1875,12 +1820,11 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![zh__TW](https://img.shields.io/badge/zh__TW-99.03%25-yellow)
+### ![zh__TW](https://img.shields.io/badge/zh__TW-99.12%25-yellow)
 
 <details>
 <summary>Missing keys in zh_TW.axaml</summary>
 
-- Text.DeleteBranch.AskForRemote
 - Text.Diff.AndMoreFiles
 - Text.Diff.FilesCount
 - Text.Diff.FirstFile

VERSION

@@ -1 +1 @@
-2026.16-sk
+2026.17-sk

src/App.Extensions.cs

@@ -18,6 +18,18 @@ public static string Escaped(this string value)
             return value.Replace("\"", "\\\"", StringComparison.Ordinal);
         }
 
+        public static string EscapeForBRE(this string value)
+        {
+            return value
+                .Replace("\\", "\\\\", StringComparison.Ordinal)
+                .Replace(".", "\\.", StringComparison.Ordinal)
+                .Replace("[", "\\[", StringComparison.Ordinal)
+                .Replace("*", "\\*", StringComparison.Ordinal)
+                .Replace("^", "\\^", StringComparison.Ordinal)
+                .Replace("$", "\\$", StringComparison.Ordinal)
+                .Replace("{", "\\{", StringComparison.Ordinal);
+        }
+
         public static string FormatFontNames(string input)
         {
             if (string.IsNullOrEmpty(input))

src/Commands/Diff.cs

@@ -33,6 +33,7 @@ public partial class Diff : Command
         private const string SPECIAL_DIFF_START = "diff ";
         private const string SPECIAL_BINARY = "Binary files ";
         private const string SPECIAL_NO_NEWLINE = " No newline at end of file";
+        private const string SPECIAL_SUBMODULE = "Subproject commit ";
 
         public Diff(string repo, Models.DiffOption opt, int numContextLines, bool ignoreWhitespace, bool ignoreCRAtEOL)
         {
@@ -92,7 +93,7 @@ public Diff(string repo, Models.DiffOption opt, int numContextLines, bool ignore
                 // Ignore exceptions.
             }
 
-            if (_result.IsBinary || _result.IsLFS || _result.TextDiff.Lines.Count == 0)
+            if (_isLFS || _result.IsBinary || _result.TextDiff.Lines.Count == 0)
             {
                 _result.TextDiff = null;
             }
@@ -104,6 +105,28 @@ public Diff(string repo, Models.DiffOption opt, int numContextLines, bool ignore
                     _isInChunk = false;
                 }
 
+                if (_result.TextDiff.Lines.Count < 4)
+                {
+                    var isSubmoduleChange = true;
+
+                    for (int i = 1; i < _result.TextDiff.Lines.Count; i++)
+                    {
+                        var line = _result.TextDiff.Lines[i];
+                        if (!line.Content.StartsWith(SPECIAL_SUBMODULE, StringComparison.Ordinal))
+                        {
+                            isSubmoduleChange = false;
+                            break;
+                        }
+                    }
+
+                    if (isSubmoduleChange)
+                    {
+                        _result.IsSubmoduleChange = true;
+                        _result.TextDiff = null;
+                        return _result;
+                    }
+                }
+
                 _result.TextDiff.MaxLineNumber = Math.Max(_newLine, _oldLine);
                 _result.TextDiff.OldMode = _result.OldMode;
                 _result.TextDiff.NewMode = _result.NewMode;
@@ -254,7 +277,7 @@ private bool ParseFileModeChange(string line)
 
         private bool ParseLFSChange(char prefix, string content)
         {
-            if (_result.IsLFS)
+            if (_isLFS)
             {
                 if (prefix == PREFIX_DELETED)
                 {
@@ -284,7 +307,7 @@ private bool ParseLFSChange(char prefix, string content)
             {
                 if (content.StartsWith(LFS_SPECIFIER, StringComparison.Ordinal))
                 {
-                    _result.IsLFS = true;
+                    _isLFS = true;
                     _result.LFSDiff = new Models.LFSDiff();
                     return true;
                 }
@@ -340,5 +363,6 @@ private void ProcessInlineHighlights()
         private int _oldLine = 0;
         private int _newLine = 0;
         private bool _isInChunk = false;
+        private bool _isLFS = false;
     }
 }

src/Commands/InteractiveRebase.cs

@@ -11,7 +11,7 @@ public InteractiveRebase(string repo, string basedOn, bool autoStash, bool noVer
             Editor = EditorType.RebaseEditor;
 
             var builder = new StringBuilder(512);
-            builder.Append("-c core.commentChar=± rebase -i --autosquash ");
+            builder.Append("-c core.commentChar=\"^\" -c core.commentString=\"±\" rebase -i --autosquash ");
             if (autoStash)
                 builder.Append("--autostash ");
             if (noVerify)

src/Commands/QuerySubmoduleRevision.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Threading.Tasks;
+
+namespace SourceGit.Commands
+{
+    public class QuerySubmoduleRevision : Command
+    {
+        public QuerySubmoduleRevision(string repo, string revision)
+        {
+            WorkingDirectory = repo;
+            Context = repo;
+
+            if (revision.EndsWith("-dirty", StringComparison.Ordinal))
+            {
+                _hasUncommittedChange = true;
+                _revision = revision.Substring(0, revision.Length - 6);
+            }
+            else
+            {
+                _hasUncommittedChange = false;
+                _revision = revision;
+            }
+        }
+
+        public async Task<Models.RevisionSubmodule> GetResultAsync()
+        {
+            Args = $"show --no-show-signature --decorate=full --format=%H%x00%P%x00%D%x00%aN±%aE%x00%at%x00%cN±%cE%x00%ct%x00%s%x00%B -s {_revision}";
+
+            var rs = await ReadToEndAsync().ConfigureAwait(false);
+            if (!rs.IsSuccess || string.IsNullOrEmpty(rs.StdOut))
+                return null;
+
+            var commit = new Models.Commit();
+            var lines = rs.StdOut.Split('\0');
+            if (lines.Length < 9)
+                return null;
+
+            commit.SHA = lines[0];
+            if (!string.IsNullOrEmpty(lines[1]))
+                commit.Parents.AddRange(lines[1].Split(' ', StringSplitOptions.RemoveEmptyEntries));
+            if (!string.IsNullOrEmpty(lines[2]))
+                commit.ParseDecorators(lines[2]);
+            commit.Author = Models.User.FindOrAdd(lines[3]);
+            commit.AuthorTime = ulong.Parse(lines[4]);
+            commit.Committer = Models.User.FindOrAdd(lines[5]);
+            commit.CommitterTime = ulong.Parse(lines[6]);
+            commit.Subject = lines[7];
+
+            var message = new Models.CommitFullMessage() { Message = lines[8].TrimEnd() };
+            var uncommittedChangesCount = 0;
+            if (_hasUncommittedChange)
+                uncommittedChangesCount = await new CountLocalChanges(WorkingDirectory, true)
+                    .GetResultAsync()
+                    .ConfigureAwait(false);
+
+            return new Models.RevisionSubmodule()
+            {
+                Commit = commit,
+                FullMessage = message,
+                UncommittedChanges = uncommittedChangesCount
+            };
+        }
+
+        private bool _hasUncommittedChange = false;
+        private string _revision = string.Empty;
+    }
+}

src/Commands/Rebase.cs

@@ -10,7 +10,7 @@ public Rebase(string repo, string basedOn, bool autoStash, bool noVerify)
             Context = repo;
 
             var builder = new StringBuilder(512);
-            builder.Append("-c core.commentChar=± rebase ");
+            builder.Append("-c core.commentChar=\"^\" -c core.commentString=\"±\" rebase ");
             if (autoStash)
                 builder.Append("--autostash ");
             if (noVerify)

src/Models/DiffResult.cs

@@ -101,7 +101,7 @@ public class SubmoduleDiff
     public class DiffResult
     {
         public bool IsBinary { get; set; } = false;
-        public bool IsLFS { get; set; } = false;
+        public bool IsSubmoduleChange { get; set; } = false;
         public string OldHash { get; set; } = string.Empty;
         public string NewHash { get; set; } = string.Empty;
         public int OldMode { get; set; } = 0;