Merge branch 'release/v2026.17'

Author: love-linger

README.md

@@ -163,6 +163,14 @@ For **Linux** users:
   sudo apt install sourcegit
   ```
 
+* `AOSC OS`: In addition to AMD64 and ARM64, support for LoongArch and RISC-V has been added.
+  ```shell
+  sudo oma install sourcegit
+  ```
+  
+> [!NOTE]
+> RISC-V support is untested.
+
 * `AppImage` files can be found on [AppImage hub](https://appimage.github.io/SourceGit/), `xdg-open` (`xdg-utils`) must be installed to support open native file manager.
 * Make sure [git-credential-manager](https://github.com/git-ecosystem/git-credential-manager/releases) or [git-credential-libsecret](https://pkgs.org/search/?q=git-credential-libsecret) is installed on your Linux.
 * Maybe you need to set environment variable `AVALONIA_SCREEN_SCALE_FACTORS`. See https://github.com/AvaloniaUI/Avalonia/wiki/Configuring-X11-per-monitor-DPI.

VERSION

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

src/Commands/Pull.cs

@@ -13,10 +13,13 @@ public Pull(string repo, string remote, string branch, bool useRebase)
             Context = repo;
 
             var builder = new StringBuilder(512);
-            builder.Append("pull --verbose --progress ");
-            if (useRebase)
-                builder.Append("--rebase=true ");
-            builder.Append(remote).Append(' ').Append(branch);
+            builder
+                .Append("pull --verbose --progress --rebase=")
+                .Append(useRebase ? "true" : "false")
+                .Append(' ')
+                .Append(remote)
+                .Append(' ')
+                .Append(branch);
 
             Args = builder.ToString();
         }

src/Commands/QueryConflictFileState.cs

@@ -12,7 +12,7 @@ public QueryConflictFileState(string repo, Models.Change change)
 
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"diff --no-color --no-ext-diff --full-index --patch {opt}";
+            Args = $"diff --no-color --no-ext-diff --no-textconv --full-index --patch {opt}";
         }
 
         public async Task<Models.ConflictFileState> GetResultAsync()

src/Models/IpcChannel.cs

@@ -71,10 +71,15 @@ public void Dispose()
 
         private static string GetPipeName()
         {
+            // SourceGit does not support multiple instances on macOS, so we can use a fixed pipe name for macOS.
+            if (OperatingSystem.IsMacOS())
+                return "SourceGit";
+
+            // Windows and Linux can have multiple instances of SourceGit running (portable-mode), so we need to generate a unique pipe name based on the data directory.
             var dataDir = Native.OS.DataDir.Replace('\\', '/').TrimEnd('/');
-            var hash = SHA256.HashData(Encoding.UTF8.GetBytes(dataDir));
-            var hashStr = Convert.ToHexString(hash)[..16];
-            return $"SourceGitIPCChannel{Environment.UserName}_{hashStr}";
+            var hashStr = $"{Environment.UserName}_{dataDir}";
+            var hash = Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(hashStr))).Substring(0, 10);
+            return $"SG_{hash}";
         }
 
         private async void StartServer()

src/ViewModels/AddRemote.cs

@@ -44,6 +44,12 @@ public string SSHKey
             set => SetProperty(ref _sshkey, value, true);
         }
 
+        public bool FetchWithoutTags
+        {
+            get;
+            set;
+        } = false;
+
         public AddRemote(Repository repo)
         {
             _repo = repo;
@@ -105,7 +111,7 @@ public override async Task<bool> Sure()
                     .Use(log)
                     .SetAsync($"remote.{_name}.sshkey", _useSSH ? SSHKey : null);
 
-                await new Commands.Fetch(_repo.FullPath, _name, false, false)
+                await new Commands.Fetch(_repo.FullPath, _name, FetchWithoutTags, false)
                     .Use(log)
                     .RunAsync();
             }

src/ViewModels/AddWorktree.cs

@@ -80,9 +80,14 @@ public AddWorktree(Repository repo)
             foreach (var branch in repo.Branches)
             {
                 if (branch.IsLocal)
-                    LocalBranches.Add(branch);
+                {
+                    if (!branch.IsCurrent && !branch.HasWorktree)
+                        LocalBranches.Add(branch);
+                }
                 else
+                {
                     RemoteBranches.Add(branch);
+                }
             }
         }
 

src/Views/AddRemote.axaml

@@ -19,7 +19,7 @@
                  Text="{DynamicResource Text.Remote.AddTitle}"/>
     </StackPanel>
 
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32,Auto" ColumnDefinitions="120,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,Auto,32" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -85,6 +85,10 @@
           </TextBox.InnerRightContent>
         </TextBox>
       </Border>
+
+      <CheckBox Grid.Row="3" Grid.Column="1"
+                Content="{DynamicResource Text.Fetch.NoTags}"
+                IsChecked="{Binding FetchWithoutTags, Mode=TwoWay}"/>
     </Grid>
   </StackPanel>
 </UserControl>

src/Views/Blame.axaml

@@ -2,6 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:m="using:SourceGit.Models"
                     xmlns:vm="using:SourceGit.ViewModels"
                     xmlns:v="using:SourceGit.Views"
                     xmlns:c="using:SourceGit.Converters"
@@ -111,17 +112,23 @@
       </Button>
 
       <Border Grid.Column="3" Padding="6,0" Margin="0,2" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}" Background="#20000000">
-        <Grid ColumnDefinitions="Auto,*">
-          <TextBlock Grid.Column="0"
-                     FontWeight="Bold"
-                     Margin="0,0,6,0"
-                     FontFamily="{DynamicResource Fonts.Monospace}"
-                     Text="{Binding Revision.SHA, Converter={x:Static c:StringConverters.ToShortSHA}, Mode=OneWay}"/>
+        <ContentControl Content="{Binding Revision, Mode=OneWay}">
+          <ContentControl.DataTemplates>
+            <DataTemplate DataType="m:Commit">
+              <Grid ColumnDefinitions="Auto,*">
+                <TextBlock Grid.Column="0"
+                           FontWeight="Bold"
+                           Margin="0,0,6,0"
+                           FontFamily="{DynamicResource Fonts.Monospace}"
+                           Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}, Mode=OneWay}"/>
 
-          <TextBlock Grid.Column="1"
-                     Text="{Binding Revision.Subject}"
-                     TextTrimming="CharacterEllipsis"/>
-        </Grid>
+                <TextBlock Grid.Column="1"
+                           Text="{Binding Subject}"
+                           TextTrimming="CharacterEllipsis"/>
+              </Grid>
+            </DataTemplate>
+          </ContentControl.DataTemplates>
+        </ContentControl>
       </Border>
 
       <Button Grid.Column="4"

src/Views/CommitMessageToolBox.axaml

@@ -13,19 +13,22 @@
           BorderBrush="{DynamicResource Brush.Border2}"
           CornerRadius="4">
     <Grid RowDefinitions="*,24">
-      <Grid Grid.Row="0">
+      <Grid Grid.Row="0">        
         <v:CommitMessageTextBox x:Name="Editor"
-                                Classes="no_border"
+                                Classes="no_border no_background"
                                 CornerRadius="4,4,0,0"
                                 Background="Transparent"
                                 Text="{Binding #ThisControl.CommitMessage, Mode=TwoWay}"
                                 Watermark="{DynamicResource Text.CommitMessageTextBox.Placeholder}"
                                 SubjectGuideLength="{Binding Source={x:Static vm:Preferences.Instance}, Path=SubjectGuideLength, Mode=OneWay}"
-                                FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=EditorFontSize, Mode=OneWay}"/>
-
-        <v:CommitMessageSubjectEndIndicator LineBrush="{DynamicResource Brush.Border2}"
-                                            FontFamily="{DynamicResource Fonts.Default}"
-                                            SubjectEndY="{Binding #Editor.SubjectEndY, Mode=OneWay}"/>
+                                GuideLineBrush="{DynamicResource Brush.Border2}"
+                                FontFamily="{DynamicResource Fonts.Monospace}">
+          <v:CommitMessageTextBox.Styles>
+            <Style Selector="ContentPresenter">
+              <Setter Property="FontFamily" Value="{DynamicResource Fonts.Monospace}"/>
+            </Style>
+          </v:CommitMessageTextBox.Styles>
+        </v:CommitMessageTextBox>
 
         <Popup PlacementTarget="{Binding #Editor, Mode=OneWay}"
                Placement="AnchorAndGravity"
@@ -85,7 +88,7 @@
               BorderThickness="0,1,0,0"
               BorderBrush="{DynamicResource Brush.Border2}"
               CornerRadius="0,0,4,4">
-        <Grid ColumnDefinitions="Auto,Auto,Auto,*" >
+        <Grid ColumnDefinitions="Auto,Auto,Auto,*">
           <Button Grid.Column="0"
                   Classes="icon_button"
                   Width="28"
@@ -119,26 +122,6 @@
                       Margin="0,0,6,0"
                       HorizontalAlignment="Right" VerticalAlignment="Stretch"
                       Orientation="Horizontal">
-            <Rectangle Width=".5"
-                       Margin="8,0"
-                       Fill="{DynamicResource Brush.Border2}"
-                       HorizontalAlignment="Center"
-                       VerticalAlignment="Stretch"/>
-
-            <TextBlock Classes="info_label"
-                       FontSize="13"
-                       HorizontalAlignment="Left"
-                       Text="{DynamicResource Text.CommitMessageTextBox.Column}"/>
-            <TextBlock Margin="8,0,0,0"
-                       FontSize="11"
-                       Text="{Binding #Editor.Column, Mode=OneWay}"/>
-
-            <Rectangle Width=".5"
-                       Margin="8,0"
-                       Fill="{DynamicResource Brush.Border2}"
-                       HorizontalAlignment="Center"
-                       VerticalAlignment="Stretch"/>
-
             <TextBlock Classes="info_label"
                        FontSize="13"
                        HorizontalAlignment="Left"