Merge branch 'release/v2026.15'

Author: love-linger

.gitignore

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

TRANSLATION.md

@@ -116,63 +116,9 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![el__GR](https://img.shields.io/badge/el__GR-97.05%25-yellow)
+### ![el__GR](https://img.shields.io/badge/el__GR-%E2%88%9A-brightgreen)
 
-<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.EmptyFile
-- 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.TagCM.Checkout
-- Text.TagCM.Merge
-- Text.UpdateSubmodules.Recursive
-- Text.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder
-
-</details>
-
-### ![es__ES](https://img.shields.io/badge/es__ES-98.82%25-yellow)
-
-<details>
-<summary>Missing keys in es_ES.axaml</summary>
-
-- Text.DeleteBranch.AskForRemote
-- Text.DeleteBranch.Force
-- 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.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder
-
-</details>
+### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
 
 ### ![fr__FR](https://img.shields.io/badge/fr__FR-95.97%25-yellow)
 
@@ -990,25 +936,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-98.82%25-yellow)
-
-<details>
-<summary>Missing keys in ru_RU.axaml</summary>
-
-- Text.DeleteBranch.AskForRemote
-- Text.DeleteBranch.Force
-- 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.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder
-
-</details>
+### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
 
 ### ![ta__IN](https://img.shields.io/badge/ta__IN-64.83%25-red)
 
@@ -1734,20 +1662,6 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![zh__CN](https://img.shields.io/badge/zh__CN-99.90%25-yellow)
-
-<details>
-<summary>Missing keys in zh_CN.axaml</summary>
-
-- Text.DeleteBranch.AskForRemote
-
-</details>
-
-### ![zh__TW](https://img.shields.io/badge/zh__TW-99.90%25-yellow)
-
-<details>
-<summary>Missing keys in zh_TW.axaml</summary>
-
-- Text.DeleteBranch.AskForRemote
+### ![zh__CN](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen)
 
-</details>
+### ![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen)

VERSION

@@ -1 +1 @@
-2026.14
+2026.15

depends/AvaloniaEdit

@@ -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/App.Extensions.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/Diff.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/InteractiveRebase.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/QuerySubmoduleRevision.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/Commands/Rebase.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;