Merge branch 'main' into prod

.gitea/workflows/windows-build.yml

@@ -10,7 +10,7 @@ env:
 
 jobs:
   build-windows:
-    name: Build Windows x64
+    name: Build Windows x64_86
     runs-on: ubuntu-latest
 
     steps:
@@ -33,8 +33,8 @@ jobs:
           short_sha="$(printf '%s' "$GITEA_SHA" | cut -c1-7)"
 
           echo "BUILD_HASH=${short_sha}" >> "$GITHUB_ENV"
-          echo "WINDOWS_EXE=${APP_NAME}-windows-x64-${short_sha}.exe" >> "$GITHUB_ENV"
-          echo "WINDOWS_ARTIFACT=${APP_NAME}-windows-x64-${short_sha}" >> "$GITHUB_ENV"
+          echo "WINDOWS_EXE=${APP_NAME}-windows-x64_86-${short_sha}.exe" >> "$GITHUB_ENV"
+          echo "WINDOWS_ARTIFACT=${APP_NAME}-windows-x64_86-${short_sha}" >> "$GITHUB_ENV"
 
       - name: Install dependencies
         run: |
@@ -144,7 +144,10 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y cmake ninja-build curl jq dpkg-dev
+          sudo apt-get install -y \
+            cmake ninja-build curl jq dpkg-dev \
+            libx11-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev \
+            libgl1-mesa-dev
 
       - name: Configure Linux release build
         run: |
@@ -256,8 +259,8 @@ jobs:
           echo "RELEASE_TAG=release-${short_sha}" >> "$GITHUB_ENV"
           echo "RELEASE_NAME=Release ${short_sha}" >> "$GITHUB_ENV"
 
-          echo "WINDOWS_EXE=${APP_NAME}-windows-x64-${short_sha}.exe" >> "$GITHUB_ENV"
-          echo "WINDOWS_ARTIFACT=${APP_NAME}-windows-x64-${short_sha}" >> "$GITHUB_ENV"
+          echo "WINDOWS_EXE=${APP_NAME}-windows-x64_86-${short_sha}.exe" >> "$GITHUB_ENV"
+          echo "WINDOWS_ARTIFACT=${APP_NAME}-windows-x64_86-${short_sha}" >> "$GITHUB_ENV"
 
           echo "LINUX_DEB=${APP_NAME}-deb-x64-${short_sha}.deb" >> "$GITHUB_ENV"
           echo "LINUX_ARTIFACT=${APP_NAME}-deb-x64-${short_sha}" >> "$GITHUB_ENV"
@@ -336,7 +339,7 @@ jobs:
             if [ "$WINDOWS_RESULT" = "success" ]; then
               echo "- ${WINDOWS_EXE}"
             else
-              echo "- Windows x64 failed"
+              echo "- Windows x64_86 failed"
             fi
 
             if [ "$LINUX_RESULT" = "success" ]; then

CMakeLists.txt

@@ -17,6 +17,10 @@ set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
 set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
 set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
 set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)
+if(UNIX AND NOT APPLE)
+    set(GLFW_BUILD_X11 ON CACHE BOOL "" FORCE)
+    set(GLFW_BUILD_WAYLAND OFF CACHE BOOL "" FORCE)
+endif()
 add_subdirectory(vendor/glfw EXCLUDE_FROM_ALL)
 
 # Dear ImGui does not ship a CMake target, so keep its static-library recipe here.

README.md

@@ -1,8 +1,8 @@
-# Gitree
+![Gitree banner](.gitea/images/gitree_banner_rounded.png)
 
 [![Windows build](https://dock-it.dev/Idea-Studios/Gitree/actions/workflows/windows-build.yml/badge.svg?branch=prod)](https://dock-it.dev/Idea-Studios/Gitree/actions?workflow=windows-build.yml)
 [![Latest release](https://img.shields.io/gitea/v/release/Idea-Studios/Gitree?gitea_url=https%3A%2F%2Fdock-it.dev&label=release)](https://dock-it.dev/Idea-Studios/Gitree/releases/latest)
-[![Platform](https://img.shields.io/badge/platform-Windows_x64-0078D4?logo=windows)](https://dock-it.dev/Idea-Studios/Gitree/releases)
+[![Latest release builds](https://img.shields.io/badge/latest%20release-Windows_x64__86_%2B_Linux_x64_DEB-2ea043)](https://dock-it.dev/Idea-Studios/Gitree/releases/latest)
 [![C++](https://img.shields.io/badge/C%2B%2B-20-00599C?logo=cplusplus)](https://en.cppreference.com/w/cpp/20)
 [![License](https://img.shields.io/badge/license-CC_BY--SA_4.0-lightgrey.svg)](https://dock-it.dev/Idea-Studios/Gitree/src/branch/prod/LICENSE)
 
@@ -10,7 +10,7 @@ A fast, native Git desktop client for Windows.
 
 ## Download
 
-Download the current Windows x64 executable from the
+Download the current Windows x64_86 executable or Linux x64 DEB from the
 [latest release](https://dock-it.dev/Idea-Studios/Gitree/releases/latest), or browse
 [all releases](https://dock-it.dev/Idea-Studios/Gitree/releases).
 
@@ -22,7 +22,7 @@ Open Gitree, choose **Open repository**, and select a local Git repository. You
 also pass its path when launching from a terminal:
 
 ```powershell
-.\Gitree-windows-x64.exe C:\path\to\repository
+.\Gitree-windows-x64_86.exe C:\path\to\repository
 ```
 
 Use the sidebar to switch branches and browse refs. Select a commit to inspect its
@@ -32,7 +32,7 @@ details and changes. The commit area lets you stage files and create commits.
 
 ### Requirements
 
-- Windows 10 or later (x64)
+- Windows 10 or later (x64_86)
 - [Git](https://git-scm.com/download/win)
 - [CMake 3.21 or later](https://cmake.org/download/)
 - A C++20 compiler: Visual Studio 2022 with the **Desktop development with C++**
@@ -91,3 +91,7 @@ cmake --build build --parallel
 
 Gitree is licensed under the [Creative Commons Attribution-ShareAlike 4.0
 International license](https://dock-it.dev/Idea-Studios/Gitree/src/branch/prod/LICENSE).
+
+## Powered by Idea Studios
+
+![Idea Studios Engine](.gitea/images/id-engine.jpg)

src/managers/git_manager.cpp

@@ -123,7 +123,6 @@ namespace
         return origin != remotes.end() ? *origin : remotes.front();
     }
 
-#ifdef _WIN32
     std::string encodeBase64(std::string_view value)
     {
         static constexpr std::string_view alphabet =
@@ -143,7 +142,6 @@ namespace
         }
         return encoded;
     }
-#endif
 
     std::vector<std::string> withAuthOverrideArguments(std::vector<std::string> arguments,
                                                        const std::optional<GitAuthOverride> &auth)
@@ -933,6 +931,8 @@ bool GitManager::captureGit(RepositoryView &repository, const std::vector<std::s
     }
 #else
     (void)arguments;
+    (void)command_output;
+    (void)stdin_data;
     error = "Git commands are currently supported on Windows";
     return false;
 #endif

src/ui/gitree_ui.cpp

@@ -1336,7 +1336,7 @@ void sidebar_item_context(const std::string& item, SidebarItemKind kind) {
     if (ImGui::MenuItem(ICON_TB_FOLDER_OPEN "  Open in file manager")) {
         std::string error;
         const std::filesystem::path path = kind == SidebarItemKind::worktree
-            ? g_git_manager->worktreePath(repo(), item, error)
+            ? std::filesystem::path(g_git_manager->worktreePath(repo(), item, error))
             : std::filesystem::path(repo().path) / item;
         if (path.empty() || !izo::OpenPath(path, &error)) g_notice = error;
     }